New awesome rc.lua

1 files changed, 313 insertions, 302 deletions

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 6132386..23d7210 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -1,16 +1,21 @@
-require("awful")
+-- Standard awesome library
+local gears = require("gears")
+local awful = require("awful")
+-- Widget and layout library
+local wibox = require("wibox")
+-- Theme handling library
+local beautiful = require("beautiful")
+-- Notification library
+local naughty = require("naughty")
+local menubar = require("menubar")
+
+awful.rules = require("awful.rules")
 require("awful.autofocus")
-require("awful.rules")
-require("beautiful")
-require("bowl")
-require("keychain")
-require("naughty")
-require("ext")
-require("oni")
-
---- 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)
+
+----- 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!",
@@ -20,7 +25,7 @@ end
 -- Handle runtime errors after startup
 do
     local in_error = false
-    awesome.add_signal("debug::error", function (err)
+    awesome.connect_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
@@ -31,33 +36,26 @@ do
         in_error = false
     end)
 end
-
--- {{{ Variable definitions
+
+----- Variable definitions
 -- Themes define colours, icons, and wallpapers
-beautiful.init("/home/slash/.config/awesome/themes/custom/theme.lua")
-
-bowl.init({ use_timers = true, timeout = 1 })
-bowl.default_setup()
-
-keychain.init({ escapes = {
-                   keychain.keystroke ({ }, "Escape"),
-                   keychain.keystroke ({ "Control", }, "g")
-} })
+beautiful.init("/usr/share/awesome/themes/default/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
 terminal = "urxvt"
 editor = os.getenv("EDITOR") or "nano"
 editor_cmd = terminal .. " -e " .. editor
 
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
+----- Default modkey.
+-- Usually, Mod4 is the key with a logo between Control and Alt. If
+-- you do not like this or do not have such a key, I suggest you to
+-- remap Mod4 to another key using xmodmap or other tools. However,
+-- you can use another modifier like Mod1, but it may interact with
+-- others.
 modkey = "Mod4"
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
-layouts =
+local layouts =
 {
     awful.layout.suit.tile,
     awful.layout.suit.tile.left,
@@ -65,23 +63,30 @@ layouts =
     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
 }
--- }}}
-
--- {{{ Tags
+
+----- Wallpaper
+if beautiful.wallpaper then
+    for s = 1, screen.count() do
+        gears.wallpaper.maximized(beautiful.wallpaper, s, true)
+    end
+end
+
+----- Tags
 -- Define a tag table which hold all screen tags.
 tags = {}
 for s = 1, screen.count() do
     -- Each screen has its own tag table.
     tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s, layouts[1])
 end
--- }}}
-
--- {{{ Menu
+
+----- Menu
 -- Create a laucher widget and a main menu
 myawesomemenu = {
    { "manual", terminal .. " -e man awesome" },
@@ -90,38 +95,20 @@ myawesomemenu = {
    { "quit", awesome.quit }
 }
 
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
+mymainmenu = awful.menu(
+   { items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
+               { "open terminal", terminal } } })
 
-mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
+mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })
--- }}}
 
--- {{{ Wibox
+-- Menubar configuration
+menubar.utils.terminal = terminal -- Set the terminal for applications
+                                  -- that require it
+
+----- Wibox
 -- Create a textclock widget
-mytextclock = awful.widget.textclock({ align = "right" })
-
--- Create a systray
-mysystray = widget({ type = "systray" })
-
--- Create a mailbox widget
-myryumailbox = oni.mailcount_widgets("ryu", "ryuslash.org", "ryuslash")
-myaethonmailbox = oni.mailcount_widgets("aet", "aethon", "aethon")
-mygmailmailbox = oni.mailcount_widgets("gmail", "gmail", "gmail")
-my9fmailbox = oni.mailcount_widgets("9f", "ninthfloor", "ninthfloor")
-
-mymailboxtimer = timer({ timeout = 60 })
-mymailboxtimer:add_signal(
-   "timeout",
-   function ()
-      myryumailbox.count.text = string.format(" %d ", oni.mailcount("ryuslash.org"))
-      myaethonmailbox.count.text = string.format(" %d ", oni.mailcount("aethon"))
-      mygmailmailbox.count.text = string.format(" %d ", oni.mailcount("gmail"))
-      my9fmailbox.count.text = string.format(" %d ", oni.mailcount("ninthfloor"))
-   end)
-mymailboxtimer:start()
+mytextclock = awful.widget.textclock()
 
 -- Create a wibox for each screen and add it
 mywibox = {}
@@ -129,286 +116,310 @@ 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.viewnext),
-                    awful.button({ }, 5, awful.tag.viewprev)
-                    )
+   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,
+                function(t)
+                   awful.tag.viewnext(awful.tag.getscreen(t))
+                end),
+   awful.button({ }, 5,
+                function(t)
+                   awful.tag.viewprev(awful.tag.getscreen(t))
+                end))
 mytasklist = {}
-mytasklist.buttons = awful.util.table.join(
-                     awful.button({ }, 1, function (c)
-                                              if c == client.focus then
-                                                  c.minimized = true
-                                              else
-                                                  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()
-                                              end
-                                          end),
-                     awful.button({ }, 3, function ()
-                                              if instance then
-                                                  instance:hide()
-                                                  instance = nil
-                                              else
-                                                  instance = awful.menu.clients({ width=250 })
-                                              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 for each screen
-    mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright })
+    mypromptbox[s] = awful.widget.prompt()
     -- Create an imagebox widget which will contains an icon indicating which layout we're using.
     -- We need one layoutbox per screen.
     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),
-                           awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
+    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),
+          awful.button({ }, 4,
+                       function () awful.layout.inc(layouts, 1) end),
+          awful.button({ }, 5,
+                       function () awful.layout.inc(layouts, -1) end)))
     -- Create a taglist widget
-    mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.all, mytaglist.buttons)
+    mytaglist[s] = awful.widget.taglist(
+       s, awful.widget.taglist.filter.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)
+    mytasklist[s] = awful.widget.tasklist(
+       s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
 
     -- Create the wibox
     mywibox[s] = awful.wibox({ position = "top", screen = s })
-    -- Add widgets to the wibox - order matters
-    mywibox[s].widgets = {
-        {
-            mylauncher,
-            mytaglist[s],
-            mypromptbox[s],
-            layout = awful.widget.layout.horizontal.leftright
-        },
-        mylayoutbox[s],
-        mytextclock,
-        s == 1 and mysystray or nil,
-        s == 1 and my9fmailbox.count or nil,
-        s == 1 and my9fmailbox.label or nil,
-        s == 1 and mygmailmailbox.count or nil,
-        s == 1 and mygmailmailbox.label or nil,
-        s == 1 and myaethonmailbox.count or nil,
-        s == 1 and myaethonmailbox.label or nil,
-        s == 1 and myryumailbox.count or nil,
-        s == 1 and myryumailbox.label or nil,
-        mytasklist[s],
-        layout = awful.widget.layout.horizontal.rightleft
-    }
+
+    -- Widgets that are aligned to the left
+    local left_layout = wibox.layout.fixed.horizontal()
+    left_layout:add(mylauncher)
+    left_layout:add(mytaglist[s])
+    left_layout:add(mypromptbox[s])
+
+    -- Widgets that are aligned to the right
+    local right_layout = wibox.layout.fixed.horizontal()
+    if s == 1 then right_layout:add(wibox.widget.systray()) end
+    right_layout:add(mytextclock)
+    right_layout:add(mylayoutbox[s])
+
+    -- Now bring it all together (with the tasklist in the middle)
+    local layout = wibox.layout.align.horizontal()
+    layout:set_left(left_layout)
+    layout:set_middle(mytasklist[s])
+    layout:set_right(right_layout)
+
+    mywibox[s]:set_widget(layout)
 end
--- }}}
-
--- {{{ Mouse bindings
-root.buttons(awful.util.table.join(
-    awful.button({ }, 3, function () mymainmenu:toggle() end),
-    awful.button({ }, 4, awful.tag.viewnext),
-    awful.button({ }, 5, awful.tag.viewprev)
-))
--- }}}
-
--- {{{ Key bindings
-local bind = keychain
-local sub = keychain.sub
+
+------ Mouse bindings
+root.buttons(
+   awful.util.table.join(
+      awful.button({ }, 3, function () mymainmenu:toggle() end),
+      awful.button({ }, 4, awful.tag.viewnext),
+      awful.button({ }, 5, awful.tag.viewprev)))
+
+----- Key bindings
 globalkeys = awful.util.table.join(
-   bind({ "Control", }, "i",
-        { sub({ }, "space", ext.next_client),
-          sub({ }, ",",
-              function () awful.screen.focus_relative(1) end),
-          sub({ }, ".",
-              function () awful.screen.focus_relative(-1) end),
-          sub({ "Shift", }, "1",
-              function () mypromptbox[mouse.screen]:run() end),
-          sub({ }, "f", function () oni.focus_raise("right") end),
-          sub({ }, "b", function () oni.focus_raise("left") end),
-          sub({ }, "n", function () oni.focus_raise("down") end),
-          sub({ }, "p", function () oni.focus_raise("up") end),
-          sub({ }, "c", oni.ror_term),
-          sub({ "Shift", }, "c", oni.run_term),
-          sub({ }, "e", oni.ror_editor),
-          sub({ "Shift", }, "e", oni.run_editor),
-          sub({ }, "w", oni.ror_browser),
-          sub({ "Shift", }, "w", oni.run_browser),
-          sub({ "Control", }, "i", ext.prev_client) }),
-   awful.key({ "Control", "Mod1" }, "l",
-             function () awful.util.spawn("i3lock -c 000000") end),
-   awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
-   awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
-   awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
-
-    -- awful.key({ modkey,           }, "w", function () mymainmenu:show({keygrabber=true}) end),
+   awful.key({ modkey, }, "Left", awful.tag.viewprev),
+   awful.key({ modkey, }, "Right", awful.tag.viewnext),
+   awful.key({ modkey, }, "Escape", awful.tag.history.restore),
+
+   awful.key({ modkey, }, "n",
+             function ()
+                awful.client.focus.byidx(1)
+                if client.focus then client.focus:raise() end
+             end),
+   awful.key({ modkey, }, "p",
+             function ()
+                awful.client.focus.byidx(-1)
+                if client.focus then client.focus:raise() end
+             end),
+    awful.key({ modkey, }, "w", function () mymainmenu:show() 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,           }, "u", awful.client.urgent.jumpto),
+    awful.key({ modkey, "Shift" }, "n",
+              function () awful.client.swap.byidx(1) end),
+    awful.key({ modkey, "Shift" }, "p",
+              function () awful.client.swap.byidx(-1) end),
+    awful.key({ modkey, "Control" }, "n",
+              function () awful.screen.focus_relative(1) end),
+    awful.key({ modkey, "Control" }, "p",
+              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),
 
     -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
+    awful.key({ modkey, }, "Return",
+              function () awful.util.spawn(terminal) end),
     awful.key({ modkey, "Control" }, "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),
-
-    awful.key({ modkey, "Control" }, "n", awful.client.restore),
+    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),
+
+    awful.key({ modkey, "Control" }, "j", awful.client.restore),
 
     -- Prompt
-    awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
+    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)
-)
+                 awful.prompt.run(
+                    { prompt = "Run Lua code: " },
+                    mypromptbox[mouse.screen].widget,
+                    awful.util.eval, nil,
+                    awful.util.getdir("cache") .. "/history_eval")
+              end))
+    -- Menubar
+    -- awful.key({ modkey }, "p", function() menubar.show() end))
 
 clientkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  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,           }, "t",      function (c) c.ontop = not c.ontop            end),
-    awful.key({ modkey,           }, "n",
-        function (c)
-            -- The client currently has the input focus, so it cannot be
-            -- minimized, since minimized clients can't have the focus.
-            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)
-)
+   awful.key({ modkey, }, "f",
+             function (c) c.fullscreen = not c.fullscreen 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, }, "t", function (c) c.ontop = not c.ontop 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 = 0
 for s = 1, screen.count() do
-   keynumber = math.min(9, math.max(#tags[s], keynumber));
+   keynumber = math.min(9, math.max(#tags[s], keynumber))
 end
 
--- Bind all key numbers to tags.
--- Be careful: we use keycodes to make it works on any keyboard layout.
--- This should map on the top row of your keyboard, usually 1 to 9.
+-- Bind all key numbers to tags. Be careful: we use keycodes to make
+-- it works on any keyboard layout. This should map on the top row of
+-- your keyboard, usually 1 to 9.
 for i = 1, keynumber do
-    globalkeys = awful.util.table.join(globalkeys,
-        awful.key({ modkey }, "#" .. i + 9,
-                  function ()
-                        local screen = mouse.screen
-                        if tags[screen][i] then
-                            awful.tag.viewonly(tags[screen][i])
-                        end
-                  end),
-        awful.key({ modkey, "Control" }, "#" .. i + 9,
-                  function ()
-                      local screen = mouse.screen
-                      if tags[screen][i] then
-                          awful.tag.viewtoggle(tags[screen][i])
-                      end
-                  end),
-        awful.key({ modkey, "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus and tags[client.focus.screen][i] then
-                          awful.client.movetotag(tags[client.focus.screen][i])
-                      end
-                  end),
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus and tags[client.focus.screen][i] then
-                          awful.client.toggletag(tags[client.focus.screen][i])
-                      end
-                  end))
+   globalkeys = awful.util.table.join(
+      globalkeys,
+      awful.key({ modkey }, "#" .. i + 9,
+                function ()
+                   local screen = mouse.screen
+                   if tags[screen][i] then
+                      awful.tag.viewonly(tags[screen][i])
+                   end
+                end),
+      awful.key({ modkey, "Control" }, "#" .. i + 9,
+                function ()
+                   local screen = mouse.screen
+                   if tags[screen][i] then
+                      awful.tag.viewtoggle(tags[screen][i])
+                   end
+                end),
+      awful.key({ modkey, "Shift" }, "#" .. i + 9,
+                function ()
+                   if client.focus and tags[client.focus.screen][i] then
+                      awful.client.movetotag(tags[client.focus.screen][i])
+                   end
+                end),
+      awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+                function ()
+                   if client.focus and tags[client.focus.screen][i] then
+                      awful.client.toggletag(tags[client.focus.screen][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))
+   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))
 
 -- Set keys
 root.keys(globalkeys)
--- }}}
-
--- {{{ Rules
+
+----- Rules
 awful.rules.rules = {
-    -- All clients will match this rule.
-    { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = true,
-                     keys = clientkeys,
-                     buttons = clientbuttons } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
-    { rule = { class = "pinentry" },
-      properties = { floating = true } },
-    { rule = { class = "gimp" },
-      properties = { floating = true } },
-    { rule = { class = "Emacs" },
-      properties = { tag = tags[1][1] } },
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    { rule = { class = "Firefox" },
-      properties = { tag = tags[2][1] } },
-    { rule = { class = "Conkeror" },
-      properties = { tag = tags[2][1] } },
-    { rule = { class = "URxvt" },
-      properties = { tag = tags[2][1] } },
+   -- All clients will match this rule.
+   { rule = { },
+     properties = { border_width = beautiful.border_width,
+                    border_color = beautiful.border_normal,
+                    focus = awful.client.focus.filter,
+                    keys = clientkeys,
+                    buttons = clientbuttons } },
+   { rule = { class = "MPlayer" },
+     properties = { floating = true } },
+   { rule = { class = "pinentry" },
+     properties = { floating = true } },
+   { rule = { class = "gimp" },
+     properties = { floating = true } },
+   { rule = { class = "Conkeror" },
+     properties = { floating = false,
+                    tag = tags[2][1] } },
+   -- Set Firefox to always map on tags number 2 of screen 1.
+   -- { rule = { class = "Firefox" },
+   --   properties = { tag = tags[1][2] } },
 }
--- }}}
-
--- {{{ Signals
+
+----- Signals
 -- Signal function to execute when a new client appears.
-client.add_signal("manage", function (c, startup)
-    -- Add a titlebar
-    -- awful.titlebar.add(c, { modkey = modkey })
-
-    -- 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.connect_signal(
+   "manage",
+   function (c, startup)
+      -- Enable sloppy focus
+      c:connect_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)
+            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
+
+      local titlebars_enabled = false
+      if titlebars_enabled
+         and (c.type == "normal" or c.type == "dialog") then
+      -- Widgets that are aligned to the left
+      local left_layout = wibox.layout.fixed.horizontal()
+      left_layout:add(awful.titlebar.widget.iconwidget(c))
+
+      -- Widgets that are aligned to the right
+      local right_layout = wibox.layout.fixed.horizontal()
+      right_layout:add(awful.titlebar.widget.floatingbutton(c))
+      right_layout:add(awful.titlebar.widget.maximizedbutton(c))
+      right_layout:add(awful.titlebar.widget.stickybutton(c))
+      right_layout:add(awful.titlebar.widget.ontopbutton(c))
+      right_layout:add(awful.titlebar.widget.closebutton(c))
+
+      -- The title goes in the middle
+      local title = awful.titlebar.widget.titlewidget(c)
+      title:buttons(awful.util.table.join(
+                       awful.button({ }, 1,
+                                    function()
+                                       client.focus = c
+                                       c:raise()
+                                       awful.mouse.client.move(c)
+                                    end),
+                       awful.button({ }, 3,
+                                    function()
+                                       client.focus = c
+                                       c:raise()
+                                       awful.mouse.client.resize(c)
+                                    end)))
+
+      -- Now bring it all together
+      local layout = wibox.layout.align.horizontal()
+      layout:set_left(left_layout)
+      layout:set_right(right_layout)
+      layout:set_middle(title)
+
+      awful.titlebar(c):set_widget(layout)
+      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)
--- }}}
+client.connect_signal(
+   "focus", function(c) c.border_color = beautiful.border_focus end)
+client.connect_signal(
+   "unfocus", function(c) c.border_color = beautiful.border_normal end)