update

rc.lua

@@ -1,38 +1,68 @@
+-- libraries {{{
+awful           = require("awful")
+awful.rules     = require("awful.rules")
+                  require("awful.autofocus")
+wibox           = require("wibox")
+beautiful       = require("autobeautiful")
+naughty         = require("naughty")
+conf            = require("localconf")
+                  require("errors")
+-- }}}
 
--- Standard awesome library
-require("awful")
-require("awful.autofocus")
-require("awful.rules")
-require("beautiful")
-require("naughty")
-require("teardrop")
-require("obvious.popup_run_prompt")
-require("vicious")
-require("rodentbane.rodentbane")
+layouts = require('layouts')
 
-MY_PATH  = os.getenv("HOME") .. "/.config/awesome/"
+-- {{{ Tags
 
-dofile (MY_PATH .. "localconf.lua")
+tags = require('tags')
+tags.setup()
+-- }}}
 
--- Themes define colours, icons, and wallpapers
-beautiful.init("/home/crater2150/.config/awesome/zenburn/theme.lua")
+-- {{{ widgets
+widgets = require("widgets")
+widgets.setup()
+for s = 1, screen.count() do
+	local ltop = widgets.layout(s,"left","top")
+	local rtop = widgets.layout(s,"right","top")
+	local lbottom = widgets.layout(s,"left","bottom")
 
+	-- {{{
+	widgets.add.mail(s, ltop, { os.getenv("HOME") .. "/.maildir/" })
+	widgets.add.spacer(ltop)
+	widgets.add.clock(s, ltop)
 
--- Table of layouts to cover with awful.layout.inc, order matters.
-layouts =
-{
-    awful.layout.suit.fair,
-    awful.layout.suit.fair.horizontal,
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
-    awful.layout.suit.floating
-}
+	widgets.add.layout(s, lbottom)
+	widgets.add.taglist(s, lbottom)
 
-dofile (MY_PATH .. "tags.lua")
-dofile (MY_PATH .. "wibox.lua")
-dofile (MY_PATH .. "bindings.lua")
-dofile (MY_PATH .. "rules.lua")
-dofile (MY_PATH .. "signals.lua")
--- dofile (MY_PATH .. "uzbl.lua")
+	widgets.add.cpu(s, rtop)
+	widgets.add.spacer(rtop)
+	widgets.add.battery(s, rtop, "BAT0")
+	widgets.add.spacer(rtop)
+	widgets.add.battery(s, rtop, "BAT1")
+	widgets.add.spacer(rtop)
+	widgets.add.wifi(s, rtop, "wlan0")
+	widgets.add.spacer(rtop)
+	widgets.add.systray(s, rtop)
+
+	widgets.set_spacer_text("    ◈    ")
+end
+-- }}}
+
+-- {{{ Key bindings
+globalkeys = {}
+globalkeys = layouts.extend_key_table(globalkeys);
+globalkeys = tags.extend_key_table(globalkeys);
+
+bindings = require("bindings")
+bindings.extend_and_register_key_table(globalkeys)
+bindings.mb.set_x_offset(18)
+-- }}}
+
+-- {{{ rules
+rules = require("rules")
+rules.setup()
+-- }}}
+
+require("signals")
+
+--
+-- vim: fdm=marker