commit c92cccdaa62c9ca82133d8d6ac9130a2823d8edb
Author: Guillaume DOTT <guillaume+github@dott.fr>
Date:   Fri Nov 9 00:26:18 2012 +0100

    Refactoring of my Awesome WM config

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..338c30b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+config.lua
diff --git a/rc.lua b/rc.lua
new file mode 100644
index 0000000..9f23c47
--- /dev/null
+++ b/rc.lua
@@ -0,0 +1,482 @@
+-- Standard awesome library
+require("awful")
+require("awful.autofocus")
+require("awful.rules")
+-- Theme handling library
+require("beautiful")
+-- Notification library
+require("naughty")
+
+require("util")
+config_loaded = pcall(function() require("config") end)
+
+-- {{{ Error handling
+-- Check if awesome encountered an error during startup and fell back to
+-- another config (This code will only ever execute for the fallback config)
+if awesome.startup_errors then
+    naughty.notify({ preset = naughty.config.presets.critical,
+                     title = "Oops, there were errors during startup!",
+                     text = awesome.startup_errors })
+end
+
+-- Handle runtime errors after startup
+do
+    local in_error = false
+    awesome.add_signal("debug::error", function (err)
+        -- Make sure we don't go into an endless error loop
+        if in_error then return end
+        in_error = true
+
+        naughty.notify({ preset = naughty.config.presets.critical,
+                         title = "Oops, an error happened!",
+                         text = err })
+        in_error = false
+    end)
+end
+-- }}}
+
+-- {{{ Variable definitions
+debug_mode = debug_mode or false
+theme = theme or "dark"
+-- Themes define colours, icons, and wallpapers
+beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/"..theme.."/theme.lua")
+
+-- Default terminal and editor
+terminal = terminal or "xterm"
+editor = os.getenv("EDITOR") or "vim"
+editor_cmd = terminal .. " -e " .. editor
+
+-- Default modkey.
+modkey = "Mod4"
+
+-- Table of layouts to cover with awful.layout.inc, order matters.
+layouts =
+{
+    awful.layout.suit.tile,
+    awful.layout.suit.tile.left,
+    awful.layout.suit.tile.bottom,
+    awful.layout.suit.tile.top,
+    awful.layout.suit.fair,
+    awful.layout.suit.fair.horizontal,
+    --awful.layout.suit.spiral,
+    --awful.layout.suit.spiral.dwindle,
+    awful.layout.suit.max,
+    awful.layout.suit.max.fullscreen,
+    --awful.layout.suit.magnifier
+    awful.layout.suit.floating,
+}
+-- }}}
+
+-- {{{ Loading of additionnal libraries
+-- Dynamic tagging library
+shifty_loaded = pcall(function() require("shifty") end)
+-- Stop loading this config if shifty is not available
+if not shifty_loaded then
+    error("needs shifty to run properly")
+end
+-- Widgets library
+vicious_loaded = pcall(function() require("vicious") end)
+if not vicious_loaded then
+    naughty.notify({ preset = naughty.config.presets.critical,
+                     title = "Oops, Vicious is not available!",
+                     text = "Install Vicious library to use more widgets." })
+    io.stderr:write("needs vicious for more advanced widgets\n")
+end
+-- }}}
+
+-- {{{ Shifty Tags
+shifty.config.tags = {
+    ["1:default"] = { init = true, position = 1 },
+    ["2:prog"] = { init = true, position = 2 },
+    ["3:www"] = { exclusive = true, max_clients = 1, position = 3, spawn = "firefox -P default"},
+    ["4:im"] = { exclusive = true, init = true, position = 4 },
+    ["5:mail"] = { exclusive = true, max_clients = 2, position = 5, spawn = "thunderbird"},
+}
+shifty.config.apps = {
+        { match = {"Iceweasel.*", "Firefox.*", "Namoroka.*", "Minefield.*"       }, tag = "3:www"},
+        { match = {"Icedove.*", "Thunderbird.*", "Lanikai.*"       }, tag = "5:mail"},
+        { match = {"Irssi" }, tag = "4:im", screen = 1, nopopup = true},
+        { match = {"Pidgin*" }, tag = "8:im", screen = 2, nopopup = true},
+        { match = {"Gajim*" }, tag = "8:im", screen = 2, nopopup = true},
+        { match = {"Rhythmbox" }, tag = "5:media", screen = 1, nopopup = true},
+        { match = {"Ardour.*", "Jamin",             }, tag = "ardour"},
+        { match = {"Gimp"                           }, tag = "gimp"},
+        { match = {"TuxGuitar*"                           }, tag = "tuxguitar"},
+        { match = {"Transmission*"                           }, tag = "transmission"},
+        { match = {"gimp%-image%-window"            }, slave = true},
+        { match = {"gcolor2"                        }, intrusive = true, geometry = { 100,100,nil,nil }},
+--        { match = {"MPlayer"                        }, float = true, nopopup = true},
+        { match = {"" }, buttons = awful.util.table.join(
+    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+    awful.button({ modkey }, 1, awful.mouse.client.move),
+    awful.button({ modkey }, 3, awful.mouse.client.resize)) }
+}
+
+shifty.config.defaults = {
+}
+
+shifty.init()
+-- }}}
+
+-- {{{ Menu
+-- Create a laucher widget and a main menu
+myawesomemenu = {
+   { "manual", terminal .. " -e man awesome" },
+   { "edit config", editor_cmd .. " " .. awesome.conffile },
+   { "restart", awesome.restart },
+   { "quit", awesome.quit }
+}
+
+mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
+                                    { "open terminal", terminal }
+                                  }
+                        })
+
+mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
+                                     menu = mymainmenu })
+-- }}}
+
+-- {{{ Wibox
+
+-- {{{ Reusable separators
+local spacer    = widget({ type = "textbox" })
+local separator = widget({ type = "textbox" })
+spacer.text     = " "
+separator.text  = "     "
+-- }}}
+
+-- Create a textclock widget
+mytextclock = awful.widget.textclock({ align = "right" }, " %a %b %d, %H:%M:%S ", 1)
+
+-- Add a calendar on the textclock widget
+local calendar = nil
+local offset = 0
+
+function remove_calendar()
+    if calendar ~= nil then
+        naughty.destroy(calendar)
+        calendar = nil
+        offset = 0
+    end
+end
+
+function add_calendar(inc_offset)
+    local save_offset = offset
+    remove_calendar()
+    offset = save_offset + inc_offset
+
+    local datespec = os.date("*t")
+    datespec = datespec.year * 12 + datespec.month - 1 + offset
+    datespec = (datespec % 12 + 1) .. " " .. math.floor(datespec / 12)
+    local cal = awful.util.pread("/usr/bin/cal -m " .. datespec)
+    cal = string.gsub(cal, "^%s*(.-)%s*$", "%1")
+
+    calendar = naughty.notify({
+        text = string.format('<span font_desc="%s">%s</span>', "monospace", cal),
+        timeout = 0, hover_timeout = 0.5,
+        width = 115,
+    })
+end
+
+mytextclock:add_signal("mouse::leave", remove_calendar)
+
+mytextclock:buttons(awful.util.table.join(
+    -- Current month on click
+    awful.button({ }, 1, function() add_calendar(0) end),
+    -- Previous month on mouse wheel up
+    awful.button({ }, 4, function() add_calendar(-1) end),
+    -- Next month on mouse wheel down
+    awful.button({ }, 5, function() add_calendar(1) end)
+))
+
+
+-- Create a systray
+mysystray = widget({ type = "systray" })
+
+-- Create a wibox for each screen and add it
+mywibox = {}
+mypromptbox = {}
+mylayoutbox = {}
+mytaglist = {}
+mytaglist.buttons = awful.util.table.join(
+                    awful.button({ }, 1, awful.tag.viewonly),
+                    awful.button({ modkey }, 1, awful.client.movetotag),
+                    awful.button({ }, 3, awful.tag.viewtoggle),
+                    awful.button({ modkey }, 3, awful.client.toggletag),
+                    awful.button({ }, 4, awful.tag.viewprev),
+                    awful.button({ }, 5, awful.tag.viewnext)
+                    )
+
+mytasklist = {}
+mytasklist.buttons = awful.util.table.join(
+                     awful.button({ }, 1, function (c)
+                                                  if not c:isvisible() then
+                                                      awful.tag.viewonly(c:tags()[1])
+                                                  end
+                                                  -- This will also un-minimize
+                                                  -- the client, if needed
+                                                  client.focus = c
+                                                  c:raise()
+
+                                                  -- Print client infos on click on the tasklist
+                                                  if debug_mode then
+                                                      c_infos = "class:" ..c.class ..
+                                                        "\tinstance:" .. c.instance ..
+                                                        "\tname:" .. c.name
+                                                      io.stderr:write(c_infos .. "\n")
+                                                  end
+                                          end),
+                     awful.button({ }, 4, function ()
+                                              awful.client.focus.byidx(1)
+                                              if client.focus then client.focus:raise() end
+                                          end),
+                     awful.button({ }, 5, function ()
+                                              awful.client.focus.byidx(-1)
+                                              if client.focus then client.focus:raise() end
+                                          end))
+for s = 1, screen.count() do
+    -- Create a promptbox
+    mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright })
+    -- Create a layoubox
+    mylayoutbox[s] = awful.widget.layoutbox(s)
+    mylayoutbox[s]:buttons(awful.util.table.join(
+                           awful.button({ }, 1, function () awful.layout.inc(layouts, -1) end),
+                           awful.button({ }, 3, function () awful.layout.inc(layouts, 1) end)
+                           ))
+    -- Create a taglist widget
+    mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.all, mytaglist.buttons)
+
+    -- Create a tasklist widget
+    mytasklist[s] = awful.widget.tasklist(function(c)
+                                              return awful.widget.tasklist.label.currenttags(c, s)
+                                          end, mytasklist.buttons)
+
+    -- Create the wibox
+    mywibox[s] = awful.wibox({ height = 15, position = "top", screen = s })
+    -- Add widgets to the wibox - order matters
+    mywibox[s].widgets = {
+        {
+            s == 1 and mylauncher or nil,
+            mytaglist[s],
+            mylayoutbox[s],
+            mypromptbox[s],
+            layout = awful.widget.layout.horizontal.leftright
+        },
+        s == 1 and mysystray or nil,
+        mytextclock,
+        mytasklist[s],
+        layout = awful.widget.layout.horizontal.rightleft
+    }
+end
+
+-- {{{ Bottom Wibox
+do
+    mybottomwibox = awful.wibox({ height = 14, position = "bottom", screen = 1 })
+
+    local left_widgets = {
+        layout = awful.widget.layout.horizontal.leftright
+    }
+    local right_widgets = {
+        layout = awful.widget.layout.horizontal.rightleft
+    }
+
+    -- {{{ Kernel version
+    local w_kernel_img = widget({ type = "imagebox" })
+    w_kernel_img.image = image(beautiful.widget_pacman)
+
+    local w_kernel_tb = widget({ type = "textbox" })
+    w_kernel_tb.text = awful.util.pread("uname -r")
+
+    left_widgets = join_tables(left_widgets, {w_kernel_img, spacer, w_kernel_tb})
+    -- }}}
+
+    if vicious_loaded then
+    end
+
+    table.insert(right_widgets, left_widgets)
+    mybottomwibox.widgets = right_widgets
+end
+-- }}}
+
+shifty.taglist = mytaglist
+shifty.prompt = mypromptbox
+-- }}}
+
+-- {{{ Key bindings
+globalkeys = awful.util.table.join(
+    awful.key({ modkey,           }, "p",   awful.tag.viewprev       ),
+    awful.key({ modkey,           }, "n",  awful.tag.viewnext       ),
+    awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
+
+    awful.key({ modkey,           }, "j",
+        function ()
+            awful.client.focus.byidx( 1)
+            if client.focus then client.focus:raise() end
+        end),
+    awful.key({ modkey,           }, "k",
+        function ()
+            awful.client.focus.byidx(-1)
+            if client.focus then client.focus:raise() end
+        end),
+
+    -- Layout manipulation
+    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end),
+    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end),
+    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
+    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
+    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
+    awful.key({ modkey,           }, "Tab",
+        function ()
+            awful.client.focus.history.previous()
+            if client.focus then
+                client.focus:raise()
+            end
+        end),
+
+    -- Hide wibox on current screen
+    awful.key({ modkey,           }, "b",
+        function ()
+                if mywibox[mouse.screen].screen == nil then
+                        mywibox[mouse.screen].screen = mouse.screen
+                        myinfowibox[mouse.screen].screen = mouse.screen
+                else
+                        mywibox[mouse.screen].screen = nil
+                        myinfowibox[mouse.screen].screen = nil
+                end
+        end),
+
+    -- Standard program
+    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
+    awful.key({ modkey, "Shift"   }, "r", awesome.restart),
+    awful.key({ modkey, "Shift"   }, "q", awesome.quit),
+
+    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
+    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)    end),
+    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1)      end),
+    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1)      end),
+    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1)         end),
+    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1)         end),
+    awful.key({ modkey,           }, "space", function () awful.layout.inc(layouts,  1) end),
+    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(layouts, -1) end),
+
+    -- restore minimized windows
+    awful.key({ modkey, "Shift" }, "m", awful.client.restore),
+
+    -- Prompt
+    awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
+
+    awful.key({ modkey }, "x",
+              function ()
+                  awful.prompt.run({ prompt = "Run Lua code: " },
+                  mypromptbox[mouse.screen].widget,
+                  awful.util.eval, nil,
+                  awful.util.getdir("cache") .. "/history_eval")
+              end),
+
+    -- Shifty
+    awful.key({ modkey, "Control" }, "p", shifty.shift_prev),
+    awful.key({ modkey, "Control" }, "n", shifty.shift_next),
+    awful.key({ modkey,  }, "t", function() shifty.add({ rel_index = 1 }) end),
+    awful.key({ modkey, "Control" }, "r", shifty.rename),
+    awful.key({ modkey,  }, "w", shifty.del)
+)
+
+clientkeys = awful.util.table.join(
+    awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
+    awful.key({ modkey,           }, "s",      function (c) c.sticky = not c.sticky  end),
+    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
+    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
+    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
+    awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
+    awful.key({ modkey, "Shift"   }, "r",      function (c) c:redraw()                       end),
+    awful.key({ modkey, "Control" }, "t",      function (c) c.ontop = not c.ontop  end),
+    awful.key({ modkey, "Control" }, "m", function (c) c.minimized = true end),
+    awful.key({ modkey,           }, "m",
+        function (c)
+            c.maximized_horizontal = not c.maximized_horizontal
+            c.maximized_vertical   = not c.maximized_vertical
+        end)
+)
+
+-- Compute the maximum number of digit we need, limited to 9
+keynumber = 9
+
+-- Bind all key numbers to tags.
+for i = 1, keynumber do
+    globalkeys = awful.util.table.join(globalkeys,
+        awful.key({ modkey }, "#" .. i + 9,
+                  function ()
+                        awful.tag.viewonly(shifty.getpos(i))
+                  end),
+        awful.key({ modkey, "Control" }, "#" .. i + 9,
+                  function ()
+                      local t = shifty.getpos(i)
+                      t.selected = not t.selected
+                  end),
+        awful.key({ modkey, "Shift" }, "#" .. i + 9,
+                  function ()
+                      if client.focus then
+                        local t = shifty.getpos(i)
+                        awful.client.movetotag(t)
+                        awful.tag.viewonly(t)
+                      end
+                  end),
+        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+                  function ()
+                      if client.focus then
+                          awful.client.toggletag(shifty.getpos(i))
+                      end
+                  end))
+end
+
+clientbuttons = awful.util.table.join(
+    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+    awful.button({ modkey }, 1, awful.mouse.client.move),
+    awful.button({ modkey }, 3, awful.mouse.client.resize))
+
+globalkeys = awful.util.table.join(
+    globalkeys,
+
+    awful.key({ }, "XF86AudioPlay", function () awful.util.pread("mpc toggle") end),
+    awful.key({ }, "XF86AudioPrev", function () awful.util.pread("mpc prev") end),
+    awful.key({ }, "XF86AudioNext", function () awful.util.pread("mpc next") end),
+
+    --awful.key({ }, "XF86AudioMute", function () gdott9.volume.volume("mute") end),
+    --awful.key({ }, "XF86AudioLowerVolume", function () gdott9.volume.volume("down") end),
+    --awful.key({ }, "XF86AudioRaiseVolume", function () gdott9.volume.volume("up") end)
+    awful.key({ }, "XF86AudioMute", function () print("mute") end),
+    awful.key({ }, "XF86AudioLowerVolume", function () print("down") end),
+    awful.key({ }, "XF86AudioRaiseVolume", function () print("up") end)
+)
+
+-- Set keys
+root.keys(globalkeys)
+-- }}}
+
+-- {{{ Signals
+-- Signal function to execute when a new client appears.
+client.add_signal("manage", function (c, startup)
+    -- Enable sloppy focus
+    c:add_signal("mouse::enter", function(c)
+        if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
+            and awful.client.focus.filter(c) then
+            client.focus = c
+        end
+    end)
+
+    if not startup then
+        -- Set the windows at the slave,
+        -- i.e. put it at the end of others instead of setting it master.
+        -- awful.client.setslave(c)
+
+        -- Put windows in a smart way, only if they does not set an initial position.
+        if not c.size_hints.user_position and not c.size_hints.program_position then
+            awful.placement.no_overlap(c)
+            awful.placement.no_offscreen(c)
+        end
+    end
+end)
+
+client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
+-- }}}
diff --git a/util.lua b/util.lua
new file mode 100644
index 0000000..a850a17
--- /dev/null
+++ b/util.lua
@@ -0,0 +1 @@
+function join_tables(t1, t2) for k,v in ipairs(t2) do table.insert(t1, v) end return t1 end