Merge branch 'feature/stretch'

1 files changed, 23 insertions, 26 deletions

diff --git a/config.dot/awesome.link/rc.lua b/config.dot/awesome.link/rc.lua
index b2ae653..0998e3b 100644
--- a/config.dot/awesome.link/rc.lua
+++ b/config.dot/awesome.link/rc.lua
@@ -3,20 +3,18 @@ homedir    = os.getenv("HOME")
 configdir  = homedir   .. "/.config/awesome"
 themes_dir = configdir .. "/themes"
 
--- Standard awesome library
-require("awful")
-require("awful.util")
-require("awful.autofocus")
-require("awful.rules")
+-- Awesome library dependencies
+gears       = require("gears")
+awful       = require("awful")
+wibox       = require("wibox")
+autofocus   = require("awful.autofocus")
+beautiful   = require("beautiful")
+naughty     = require("naughty")
+lain        = require("lain")
+freedesktop = require("freedesktop")
 
--- Theme handling library
-require("beautiful")
-
--- Notification library
-require("naughty")
-
--- Widget libraries
-require("vicious")
+-- Variables
+dofile(configdir .. "/variables.lua")
 
 -- Load Debian menu entries
 require("debian.menu")
@@ -26,23 +24,25 @@ if awful.util.file_readable(homedir .. "/.custom/awesome/settings.lua") then
   dofile(homedir .. "/.custom/awesome/settings.lua")
 end
 
--- Variables
-dofile(configdir .. "/variables.lua")
+-- Theme
+--beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
+--beautiful.init(awful.util.get_themes_dir() .. "zenburn/theme.lua")
+beautiful.init(themes_dir .. "/multicolor/theme.lua")
+
+-- Layout
+dofile(configdir .. "/layout.lua")
 
--- Load theme
-beautiful.init(themes_dir .. "/powerarrow/theme.lua")
+-- Check for errors
+dofile(configdir .. "/errors.lua")
 
 -- Misc functions
 dofile(configdir .. "/functions.lua")
 
--- Tags
-dofile(configdir .. "/tags.lua")
-
 -- Menu
 dofile(configdir .. "/menu.lua")
 
--- Wibox
-dofile(configdir .. "/wibox.lua")
+-- Wibar
+dofile(configdir .. "/wibar.lua")
 
 -- Mouse
 dofile(configdir .. "/mouse.lua")
@@ -50,7 +50,7 @@ dofile(configdir .. "/mouse.lua")
 -- Global keys
 dofile(configdir .. "/globalkeys.lua")
 
--- Custom keys
+-- Key mappings
 dofile(configdir .. "/keys.lua")
 
 -- Rules
@@ -58,6 +58,3 @@ dofile(configdir .. "/rules.lua")
 
 -- Signals
 dofile(configdir .. "/signals.lua")
-
--- Startup commands
-dofile(configdir .. "/programs.lua")