Update 20170209. Highlights: awesome 4.0, gruvbox dark -> light

1 files changed, 580 insertions, 656 deletions

diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 0175440..4c9ce02 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -1,16 +1,17 @@
 -- Standard awesome library
 local gears = require("gears")
 local awful = require("awful")
-awful.rules = require("awful.rules")
 require("awful.autofocus")
 -- Widget and layout library
 local wibox = require("wibox")
-local vicious = require("vicious")
 -- Theme handling library
 local beautiful = require("beautiful")
 -- Notification library
 local naughty = require("naughty")
 local menubar = require("menubar")
+local hotkeys_popup = require("awful.hotkeys_popup").widget
+-- System data library
+local vicious = require("vicious")
 
 -- Load Debian menu entries
 require("debian.menu")
@@ -19,46 +20,48 @@ require("debian.menu")
 -- 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
-    })
+  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.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
-
-            naughty.notify({
-                preset = naughty.config.presets.critical,
-                title = "Oops, an error happened!",
-                text = err
-            })
-            in_error = false
-        end
-    )
+  local in_error = false
+  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
+
+    naughty.notify({preset = naughty.config.presets.critical,
+                    title = "Oops, an error happened!",
+                    text = tostring(err)})
+    in_error = false
+  end)
 end
 -- }}}
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, font and wallpapers.
-beautiful.init("/home/cnx/.config/awesome/themes/gruvbox/theme.lua")
+beautiful.init("~/.config/awesome/themes/gruvbox/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
 terminal = "x-terminal-emulator"
 editor = "gvim"
-editor_cmd = terminal .. " -e vim"
+-- And some additional applications
+root_terminal = terminal .. " -e su -"
+ranger = terminal .. " -e ranger"
+python = terminal .. " -e python3"
+mutt = terminal .. " -e mutt"
 cmus = terminal .. " -e cmus"
 cmus_pause = "cmus-remote -u"
 cmus_prev = "cmus-remote -r"
 cmus_next = "cmus-remote -n"
+slock_suspend = "slock systemctl -i suspend"
+function volume_lower() awful.spawn("amixer sset Master 5%-", false) end
+function volume_raise() awful.spawn("amixer sset Master 5%+", false) end
+function volume_mute() awful.util.spawn("amixer sset Master toggle", false) end
+
 
 -- Default modkey.
 -- Usually, Mod4 is the key with a logo between Control and Alt.
@@ -69,521 +72,409 @@ cmus_next = "cmus-remote -n"
 modkey = "Mod4"
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
-local layouts = {
-    --awful.layout.suit.floating,
-    --awful.layout.suit.tile.left,
-    --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.tile.bottom,
-    awful.layout.suit.tile,
-    awful.layout.suit.magnifier
+awful.layout.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.corner.nw,
+  -- awful.layout.suit.corner.ne,
+  -- awful.layout.suit.corner.sw,
+  -- awful.layout.suit.corner.se
+  awful.layout.suit.floating,
 }
 -- }}}
 
--- {{{ Wallpaper
-awful.util.spawn_with_shell("hsetroot -solid '#282828'")
---if beautiful.wallpaper then
---    for s = 1, screen.count() do
---        gears.wallpaper.maximized(beautiful.wallpaper, s, true)
---    end
---end
--- }}}
+-- {{{ Helper functions
+local function client_menu_toggle_fn()
+  local instance = nil
 
--- {{{ 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])
+  return function()
+    if instance and instance.wibox.visible then
+      instance:hide()
+      instance = nil
+    else
+      instance = awful.menu.clients({theme = {width = 250}})
+    end
+  end
 end
 -- }}}
 
 -- {{{ Menu
--- Create a laucher widget and a main menu
+-- Create a launcher widget and a main menu
 myawesomemenu = {
-   {"manual", terminal .. " -e man awesome"},
-   {"edit config", editor_cmd .. " " .. awesome.conffile},
-   {"restart", awesome.restart},
-   {"quit", awesome.quit}
+  {"hotkeys", function() return false, hotkeys_popup.show_help end},
+  {"manual", terminal .. " -e man awesome"},
+  {"edit config", editor .. " " .. awesome.conffile},
+  {"restart", awesome.restart},
+  {"quit", function() awesome.quit() end}
 }
 
 mymainmenu = awful.menu({items = {
-    {"awesome", myawesomemenu, beautiful.awesome_icon},
-    {"Debian", debian.menu.Debian_menu.Debian},
-    {"open terminal", terminal}
+  {"awesome", myawesomemenu, beautiful.awesome_icon},
+  {"debian", debian.menu.Debian_menu.Debian},
+  {"open terminal", terminal}
 }})
 
-mylauncher = awful.widget.launcher({
-    image = beautiful.awesome_icon,
-    menu = mymainmenu
-})
+-- mylauncher = awful.widget.launcher({image = beautiful.awesome_icon,
+--                                     menu = mymainmenu})
 
 -- Menubar configuration
+-- Set geometry so it would overlay the wibox
+menubar.geometry = {y = 0, height = 22}
 -- Set the terminal for applications that require it
 menubar.utils.terminal = terminal
 -- }}}
 
--- {{{ Wibox
+-- Keyboard map indicator and switcher
+-- mykeyboardlayout = awful.widget.keyboardlayout()
+
+-- {{{ Wibar
 -- Create a textclock widget
-myclock_text = awful.widget.textclock(
-    "<span color='#3c3836'> #%u %FT%R</span>",
-    1
-)
-myclock = wibox.widget.background()
-myclock:set_widget(myclock_text)
-myclock:set_bg("#cc241d")
+mytextclock = wibox.widget.textclock(" #%u %FT%R")
 
 -- Create a CPU usage widget
-mycpuwidget_text = wibox.widget.textbox()
-vicious.register(
-    mycpuwidget_text,
-    vicious.widgets.cpu,
-    function(widget, args)
-        return("<span color='#3c3836'> CPU%03d%%</span>"):format(args[1])
-    end,
-    2
-)
-mycpuwidget = wibox.widget.background()
-mycpuwidget:set_widget(mycpuwidget_text)
-mycpuwidget:set_bg("#d65d0e")
+mycpuusage = wibox.widget.textbox()
+vicious.register(mycpuusage, vicious.widgets.cpu,
+                 function(widget, args)
+                   return (" CPU%03d%%"):format(args[1])
+                 end, 2)
 
 -- Create memory usage widgets
-mymemwidget_text = wibox.widget.textbox()
-vicious.register(
-    mymemwidget_text,
-    vicious.widgets.mem,
-    function(widget, args)
-        return("<span color='#3c3836'> MEM%03d%%</span>"):format(args[1])
-    end,
-    2
-)
-mymemwidget = wibox.widget.background()
-mymemwidget:set_widget(mymemwidget_text)
-mymemwidget:set_bg("#d79921")
-
-myswapwidget_text = wibox.widget.textbox()
-vicious.register(
-    myswapwidget_text,
-    vicious.widgets.mem,
-    function(widget, args)
-        return("<span color='#3c3836'> SWP%03d%%</span>"):format(args[5])
-    end,
-    2
-)
-myswapwidget = wibox.widget.background()
-myswapwidget:set_widget(myswapwidget_text)
-myswapwidget:set_bg("#98971a")
+vicious.cache(vicious.widgets.mem)
+mymemusage = wibox.widget.textbox() -- RAM
+vicious.register(mymemusage, vicious.widgets.mem,
+                 function(widget, args)
+                   return (" MEM%03d%%"):format(args[1])
+                 end, 2)
+myswpusage = wibox.widget.textbox() -- swap
+vicious.register(myswpusage, vicious.widgets.mem,
+                 function(widget, args)
+                   return (" SWP%03d%%"):format(args[5])
+                 end, 2)
 
 -- Create a battery widget
-mybatwidget_text = wibox.widget.textbox()
-vicious.register(
-    mybatwidget_text,
-    vicious.widgets.bat,
-    function(widget, args)
-        return("<span color='#3c3836'> %s%03d%%</span>"):format(
-            args[1],
-            args[2]
-        )
-    end,
-    5,
-    "C11F"
-)
-mybatwidget = wibox.widget.background()
-mybatwidget:set_widget(mybatwidget_text)
-mybatwidget:set_bg("#689d6a")
+mybattery = wibox.widget.textbox()
+vicious.register(mybattery, vicious.widgets.bat,
+                 function(widget, args)
+                   return(" %s%03d%%"):format(args[1], args[2])
+                 end, 5, "C11F")
 
 -- Create a volume widget
-myvolwidget_text = wibox.widget.textbox()
-vicious.register(
-    myvolwidget_text,
-    vicious.widgets.volume,
-    function(widget, args)
-        return("<span color='#3c3836'> %s%03d%%</span>"):format(
-            args[2],
-            args[1]
-        )
-    end,
-    1,
-    "Master"
-)
-myvolwidget = wibox.widget.background()
-myvolwidget:set_widget(myvolwidget_text)
-myvolwidget:set_bg("#458588")
-
--- Arrows
-myarrow0 = wibox.widget.imagebox()
-myarrow0:set_image(beautiful.arrow0)
-myarrow1 = wibox.widget.imagebox()
-myarrow1:set_image(beautiful.arrow1)
-myarrow2 = wibox.widget.imagebox()
-myarrow2:set_image(beautiful.arrow2)
-myarrow3 = wibox.widget.imagebox()
-myarrow3:set_image(beautiful.arrow3)
-myarrow4 = wibox.widget.imagebox()
-myarrow4:set_image(beautiful.arrow4)
-myarrow5 = wibox.widget.imagebox()
-myarrow5:set_image(beautiful.arrow5)
+myvolume_text = wibox.widget.textbox()
+vicious.register(myvolume_text, vicious.widgets.volume,
+                 function(widget, args)
+                   return(" %s%03d%%"):format(args[2], args[1])
+                 end, 1, "Master")
+myvolume = wibox.container.background(myvolume_text, "#458588")
+myvolume:buttons(awful.util.table.join(
+  awful.button({}, 1, volume_raise),
+  awful.button({}, 2, volume_mute),
+  awful.button({}, 3, volume_lower),
+  awful.button({}, 4, volume_raise),
+  awful.button({}, 5, volume_lower)
+))
 
 -- 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,
-        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
-                -- Without this, the following
-                -- :isvisible() makes no sense
-                c.minimized = false
-                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({
-                    theme = {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
-    )
+local taglist_buttons = awful.util.table.join(
+  awful.button({}, 1, function(t) t:view_only() end),
+  awful.button({modkey}, 1, function(t)
+    if client.focus then client.focus:move_to_tag(t) end
+  end),
+  awful.button({}, 3, awful.tag.viewtoggle),
+  awful.button({modkey}, 3, function(t)
+    if client.focus then client.focus:toggle_tag(t) end
+  end),
+  awful.button({}, 4, function(t) awful.tag.viewnext(t.screen) end),
+  awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end)
 )
 
-for s = 1, screen.count() do
-    -- Create a promptbox for each screen
-    mypromptbox[s] = awful.widget.prompt({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)
-    ))
-    -- Create a taglist widget
-    mytaglist[s] = awful.widget.taglist(
-        s,
-        awful.widget.taglist.filter.all,
-        mytaglist.buttons
-    )
-
-    -- Create a tasklist widget
-    mytasklist[s] = awful.widget.tasklist(
-        s,
-        awful.widget.tasklist.filter.currenttags,
-        mytasklist.buttons
-    )
+local tasklist_buttons = awful.util.table.join(
+  awful.button({}, 1, function(c)
+    if c == client.focus then
+      c.minimized = true
+    else
+      -- Without this, the following
+      -- :isvisible() makes no sense
+      c.minimized = false
+      if not c:isvisible() and c.first_tag then c.first_tag:view_only() end
+      -- This will also un-minimize
+      -- the client, if needed
+      client.focus = c
+      c:raise()
+    end
+  end),
+  awful.button({}, 3, client_menu_toggle_fn()),
+  awful.button({}, 4, function() awful.client.focus.byidx(1) end),
+  awful.button({}, 5, function() awful.client.focus.byidx(-1) end)
+)
 
-    -- Create the wibox
-    mywibox[s] = awful.wibox({position = "top", height = "24", screen = s})
-
-    -- Widgets that are aligned to the left
-    local left_layout = wibox.layout.fixed.horizontal()
-    --left_layout:add(mylauncher)
-    left_layout:add(myclock)
-    left_layout:add(myarrow0)
-    left_layout:add(mycpuwidget)
-    left_layout:add(myarrow1)
-    left_layout:add(mymemwidget)
-    left_layout:add(myarrow2)
-    left_layout:add(myswapwidget)
-    left_layout:add(myarrow3)
-    left_layout:add(mybatwidget)
-    left_layout:add(myarrow4)
-    left_layout:add(myvolwidget)
-    left_layout:add(myarrow5)
-    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(mytaglist[s])
-    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
+--local function set_wallpaper(s)
+--  -- Wallpaper
+--  if beautiful.wallpaper then
+--    local wallpaper = beautiful.wallpaper
+--    -- If wallpaper is a function, call it with the screen
+--    if type(wallpaper) == "function" then
+--      wallpaper = wallpaper(s)
+--    end
+--    gears.wallpaper.maximized(wallpaper, s, true)
+--  end
+--end
+awful.spawn("hsetroot -solid '#fbf1c7'")
+
+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+-- screen.connect_signal("property::geometry", set_wallpaper)
+
+awful.screen.connect_for_each_screen(function(s)
+  -- Wallpaper
+  -- set_wallpaper(s)
+
+  -- Each screen has its own tag table.
+  awful.tag({"1", "2", "3", "4", "5", "6", "7", "8", "9"}, s,
+            awful.layout.layouts[1])
+
+  -- Create a promptbox for each screen
+  s.mypromptbox = awful.widget.prompt({prompt = " "})
+  -- Create an imagebox widget which will contains an icon indicating which
+  -- layout we're using.
+  -- We need one layoutbox per screen.
+  s.mylayoutbox = awful.widget.layoutbox(s)
+  s.mylayoutbox:buttons(awful.util.table.join(
+    awful.button({}, 1, function() awful.layout.inc(1) end),
+    awful.button({}, 3, function() awful.layout.inc(-1) end),
+    awful.button({}, 4, function() awful.layout.inc(1) end),
+    awful.button({}, 5, function() awful.layout.inc(-1) end)
+  ))
+  -- Create a taglist widget
+  s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all,
+                                     taglist_buttons)
+
+  -- Create a tasklist widget
+  -- s.mytasklist = awful.widget.tasklist(
+  --   s,
+  --   awful.widget.tasklist.filter.currenttags,
+  --   tasklist_buttons
+  -- )
+
+  -- Create the wibox
+  s.mywibox = awful.wibar({position = "top", height = "22", screen = s})
+
+  -- Add widgets to the wibox
+  s.mywibox:setup {
+    layout = wibox.layout.align.horizontal,
+    { -- Left widgets
+      layout = wibox.layout.fixed.horizontal,
+      -- mylauncher,
+      wibox.container.background(mytextclock, "#cc241d"),
+      wibox.widget.imagebox(beautiful.arrow0),
+      wibox.container.background(mycpuusage, "#d65d0e"),
+      wibox.widget.imagebox(beautiful.arrow1),
+      wibox.container.background(mymemusage, "#d79921"),
+      wibox.widget.imagebox(beautiful.arrow2),
+      wibox.container.background(myswpusage, "#98971a"),
+      wibox.widget.imagebox(beautiful.arrow3),
+      wibox.container.background(mybattery, "#689d6a"),
+      wibox.widget.imagebox(beautiful.arrow4),
+      myvolume,
+      wibox.widget.imagebox(beautiful.arrow5),
+      wibox.container.background(s.mypromptbox, "#b16286"),
+      wibox.widget.imagebox(beautiful.arrow6)
+    },
+    { -- Middle widget
+      layout = wibox.layout.fixed.horizontal,
+    },
+    -- s.mytasklist,
+    { -- Right widgets
+      layout = wibox.layout.fixed.horizontal,
+      -- mykeyboardlayout,
+      wibox.widget.systray(),
+      s.mytaglist,
+      s.mylayoutbox
+    }
+  }
+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)
+  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(
-    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},
-        "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
-    ),
-    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}, "0", 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, "Control"}, "r", awesome.restart),
-    awful.key({modkey, "Control"}, "q", awesome.quit),
-    -- Not needed
-    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}, "Return", function() awful.layout.inc(layouts, 1) end),
-    awful.key(
-        {modkey, "Shift"},
-        "Return",
-        function() awful.layout.inc(layouts, -1) end
-    ),
-    -- Not used
-    --awful.key({modkey, "Control"}, "n", awful.client.restore),
-    -- Prompt
-    awful.key(
-        {modkey, "Shift"},
-        ";",
-        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
-    --),
-    -- Menubar
-    awful.key({modkey, "Shift"}, "p", function() menubar.show() end),
-
-    -- Applications
-    awful.key({modkey}, "x", function() awful.util.spawn(terminal) end),
-    awful.key(
-        {modkey, "Shift"},
-        "x",
-        function() awful.util.spawn(terminal .. " -e su -") end
-    ),
-    awful.key(
-        {modkey},
-        "p",
-        function() awful.util.spawn(terminal .. " -e python3") end
-    ),
-    awful.key(
-        {modkey},
-        "r",
-        function() awful.util.spawn(terminal .. " -e ranger") end
-    ),
-    awful.key(
-        {modkey},
-        "t",
-        function() awful.util.spawn(terminal .. " -e htop") end
-    ),
-    awful.key(
-        {modkey},
-        "c",
-        function() awful.util.spawn(cmus) end
-    ),
-    awful.key(
-        {modkey, "Shift"},
-        "c",
-        function() awful.util.spawn(cmus_pause) end
-    ),
-    awful.key(
-        {modkey, "Control"},
-        "c",
-        function() awful.util.spawn(cmus_prev) end
-    ),
-    awful.key(
-        {modkey, "Mod1"},
-        "c",
-        function() awful.util.spawn(cmus_next) end
-    ),
-    awful.key(
-        {modkey},
-        "m",
-        function() awful.util.spawn(terminal .. " -e mutt") end
-    ),
-    awful.key({modkey}, "v", function() awful.util.spawn(editor) end),
-    awful.key({modkey}, "f", function() awful.util.spawn("firefox") end),
-    awful.key({modkey}, "z", function() awful.util.spawn("zathura") end),
-    awful.key({modkey}, "s", function() awful.util.spawn("slock") end),
-    awful.key(
-        {modkey, "Shift"},
-        "s",
-        function() awful.util.spawn("slock systemctl -i suspend") end
-    )
-)
-
--- Adjusting volumes
-globalkeys = awful.util.table.join(
-    globalkeys,
-    awful.key({}, "XF86AudioRaiseVolume",
-    function() awful.util.spawn("amixer sset Master 5%+", false) end)
-)
-globalkeys = awful.util.table.join(
-    globalkeys,
-    awful.key(
-        {},
-        "XF86AudioLowerVolume",
-        function() awful.util.spawn("amixer sset Master 5%-", false) end
-    )
-)
-globalkeys = awful.util.table.join(
-    globalkeys,
-    awful.key(
-        {},
-        "XF86AudioMute",
-        function()
-            awful.util.spawn("amixer sset Master toggle", false)
-            -- The 2 following lines were needed at least on my configuration,
-            -- otherwise it would get stuck muted. However, if the channel
-            -- you're using is "Speaker" or "Headpphone" instead of "Master",
-            -- you'll have to comment out their corresponding line below.
-            awful.util.spawn("amixer sset Speaker unmute", false)
-            awful.util.spawn("amixer sset Headphone unmute", false)
-        end
-    )
+  awful.key({modkey, "Control"}, "s", hotkeys_popup.show_help,
+            {description="show help", group="awesome"}),
+  awful.key({modkey}, "Left", awful.tag.viewprev,
+            {description = "view previous", group = "tag"}),
+  awful.key({modkey}, "Right", awful.tag.viewnext,
+            {description = "view next", group = "tag"}),
+  awful.key({modkey}, "Escape", awful.tag.history.restore,
+            {description = "go back", group = "tag"}),
+
+  awful.key({modkey}, "j", function() awful.client.focus.byidx(1) end,
+            {description = "focus next by index", group = "client"}),
+  awful.key({modkey}, "k", function() awful.client.focus.byidx(-1) end,
+            {description = "focus previous by index", group = "client"}),
+  awful.key({modkey}, "w", function() mymainmenu:show() end,
+            {description = "show main menu", group = "awesome"}),
+
+  -- Layout manipulation
+  awful.key({modkey, "Shift"}, "j", function() awful.client.swap.byidx(1) end,
+            {description = "swap with next client by index", group = "client"}),
+  awful.key({modkey, "Shift"}, "k", function() awful.client.swap.byidx(-1)end,
+            {description = "swap with previous client by index",
+             group = "client"}),
+  awful.key({modkey}, "0",
+            function() awful.screen.focus_relative(1) end,
+            {description = "focus the next screen", group = "screen"}),
+  awful.key({modkey}, "u", awful.client.urgent.jumpto,
+            {description = "jump to urgent client", group = "client"}),
+  awful.key({modkey}, "Tab",
+            function()
+              awful.client.focus.history.previous()
+              if client.focus then client.focus:raise() end
+            end,
+            {description = "go back", group = "client"}),
+
+  -- Standard program
+  awful.key({modkey}, "x", function() awful.spawn(terminal) end,
+            {description = "open a terminal", group = "launcher"}),
+  awful.key({modkey, "Shift"}, "x", function() awful.spawn(root_terminal) end,
+            {description = "open a root terminal", group = "launcher"}),
+  awful.key({modkey}, "v", function() awful.spawn(editor) end,
+            {description = "open GVim", group = "launcher"}),
+  awful.key({modkey}, "b", function() awful.spawn("torbrowser-launcher") end,
+            {description = "open Tor Browser", group = "launcher"}),
+  awful.key({modkey}, "r", function() awful.spawn(ranger) end,
+            {description = "open ranger file manager", group = "launcher"}),
+  awful.key({modkey}, "p", function() awful.spawn(python) end,
+            {description = "open Python 3 interpreter", group = "launcher"}),
+  awful.key({modkey}, "z", function() awful.spawn("zathura") end,
+            {description = "open zathura document viewer", group = "launcher"}),
+  awful.key({modkey}, "m", function() awful.spawn(mutt) end,
+            {description = "open mutt mail client", group = "launcher"}),
+  awful.key({modkey}, "y", function() awful.spawn("smtube") end,
+            {description = "open YouTube browser", group = "launcher"}),
+  awful.key({modkey}, "s", function() awful.spawn("slock") end,
+            {description = "lock screen", group = "launcher"}),
+  awful.key({modkey, "Shift"}, "s", function() awful.spawn(slock_suspend) end,
+            {description = "lock screen then suspend", group = "launcher"}),
+  awful.key({modkey}, "c", function() awful.spawn(cmus) end,
+            {description = "open cmus music player", group = "launcher"}),
+  awful.key({modkey, "Shift"}, "c", function() awful.spawn(cmus_pause) end,
+            {description = "cmus: pause", group = "multimedia"}),
+  awful.key({modkey, "Control"}, "c", function() awful.spawn(cmus_prev) end,
+            {description = "cmus: previous track", group = "multimedia"}),
+  awful.key({modkey, "Mod1"}, "c", function() awful.spawn(cmus_next) end,
+            {description = "cmus: next track", group = "multimedia"}),
+  awful.key({}, "XF86AudioRaiseVolume", volume_raise,
+            {description = "raise 5% volume", group = "multimedia"}),
+  awful.key({}, "XF86AudioLowerVolume", volume_lower,
+            {description = "lower 5% volume", group = "multimedia"}),
+  awful.key({}, "XF86AudioMute", volume_mute,
+            {description = "(un)mute volume", group = "multimedia"}),
+
+  awful.key({modkey, "Control"}, "r", awesome.restart,
+            {description = "reload awesome", group = "awesome"}),
+  awful.key({modkey, "Shift"}, "q", awesome.quit,
+            {description = "quit awesome", group = "awesome"}),
+
+  awful.key({modkey}, "l", function() awful.tag.incmwfact(0.05) end,
+            {description = "increase master width factor", group = "layout"}),
+  awful.key({modkey}, "h", function() awful.tag.incmwfact(-0.05) end,
+            {description = "decrease master width factor", group = "layout"}),
+  awful.key({modkey, "Shift"}, "h",
+            function() awful.tag.incnmaster(1, nil, true) end,
+            {description = "increase the number of master clients",
+             group = "layout"}),
+  awful.key({modkey, "Shift"}, "l",
+            function() awful.tag.incnmaster(-1, nil, true) end,
+            {description = "decrease the number of master clients",
+             group = "layout"}),
+  awful.key({modkey, "Control"}, "h",
+            function() awful.tag.incncol(1, nil, true) end,
+            {description = "increase the number of columns", group = "layout"}),
+  awful.key({modkey, "Control"}, "l",
+            function() awful.tag.incncol(-1, nil, true) end,
+            {description = "decrease the number of columns", group = "layout"}),
+  awful.key({modkey}, "Return", function() awful.layout.inc(1) end,
+            {description = "select next", group = "layout"}),
+  awful.key({modkey, "Shift"}, "Return", function() awful.layout.inc(-1) end,
+            {description = "select previous", group = "layout"}),
+
+  awful.key({modkey, "Control"}, "n",
+            function()
+              local c = awful.client.restore()
+              -- Focus restored client
+              if c then
+                client.focus = c
+                c:raise()
+              end
+            end,
+            {description = "restore minimized", group = "client"}),
+
+  -- Prompt
+  awful.key({modkey}, ";",
+            function() awful.screen.focused().mypromptbox:run() end,
+            {description = "run prompt", group = "launcher"}),
+  -- Menubar
+  awful.key({modkey, "Shift"}, ";", function() menubar.show() end,
+            {description = "show the menubar", group = "launcher"})
+
+  -- I don't know any Lua.
+  -- awful.key({modkey}, "x",
+  --           function()
+  --             awful.prompt.run {
+  --               prompt = "Run Lua code: ",
+  --               textbox = awful.screen.focused().mypromptbox.widget,
+  --               exe_callback = awful.util.eval,
+  --               history_path = awful.util.get_cache_dir() .. "/history_eval"
+  --             }
+  --           end,
+  --           {description = "lua execute prompt", group = "awesome"}),
 )
 
 clientkeys = awful.util.table.join(
-    awful.key({modkey}, "q", function(c) c:kill() end),
-    awful.key(
-        {modkey, "Control"},
-        "Return",
-        function(c) c:swap(awful.client.getmaster()) end
-    ),
-    awful.key({modkey, "Shift"}, "0", awful.client.movetoscreen),
-    awful.key(
-        {modkey, "Control"},
-        "t",
-        function(c) awful.titlebar.toggle(c) end
-    )
-    -- Not used
-    --awful.key({modkey}, "f", function(c) c.fullscreen = not c.fullscreen end),
-    --awful.key({modkey, "Control"}, "space", awful.client.floating.toggle),
-    --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
+              c:raise()
+            end,
+            {description = "toggle fullscreen", group = "client"}),
+  awful.key({modkey}, "q", function(c) c:kill() end,
+            {description = "close", group = "client"}),
+  awful.key({modkey, "Control"}, "Return", awful.client.floating.toggle,
+            {description = "toggle floating", group = "client"}),
+  awful.key({modkey, "Control"}, "space",
+            function(c) c:swap(awful.client.getmaster()) end,
+            {description = "move to master", group = "client"}),
+  awful.key({modkey, "Shift"}, "0", function(c) c:move_to_screen() end,
+            {description = "move to screen", group = "client"}),
+  awful.key({modkey}, "t", function(c) c.ontop = not c.ontop end,
+            {description = "toggle keep on top", group = "client"}),
+  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,
+            {description = "minimize", group = "client"}),
+  awful.key({modkey, "Control"}, "m",
+            function(c)
+              c.maximized = not c.maximized
+              c:raise()
+            end,
+            {description = "maximize", group = "client"})
 )
 
 -- Bind all key numbers to tags.
@@ -591,64 +482,50 @@ clientkeys = awful.util.table.join(
 -- This should map on the top row of your keyboard, usually 1 to 9.
 for i = 1, 9 do
     globalkeys = awful.util.table.join(
-        globalkeys,
-        -- View tag only.
-        awful.key(
-            {modkey},
-            "#" .. i + 9,
-            function()
-                  local screen = mouse.screen
-                  local tag = awful.tag.gettags(screen)[i]
-                  if tag then
-                     awful.tag.viewonly(tag)
+      globalkeys,
+      -- View tag only.
+      awful.key({modkey}, "#" .. i + 9,
+                function()
+                  local screen = awful.screen.focused()
+                  local tag = screen.tags[i]
+                  if tag then tag:view_only() end
+                end,
+                {description = "view tag #"..i, group = "tag"}),
+      -- Toggle tag display.
+      awful.key({modkey, "Control"}, "#" .. i + 9,
+                function()
+                  local screen = awful.screen.focused()
+                  local tag = screen.tags[i]
+                  if tag then awful.tag.viewtoggle(tag) end
+                end,
+                {description = "toggle tag #" .. i, group = "tag"}),
+      -- Move client to tag.
+      awful.key({modkey, "Shift"}, "#" .. i + 9,
+                function()
+                  if client.focus then
+                    local tag = client.focus.screen.tags[i]
+                    if tag then client.focus:move_to_tag(tag) end
                   end
-            end
-        ),
-        -- Toggle tag.
-        awful.key(
-            {modkey, "Control"},
-            "#" .. i + 9,
-            function()
-                local screen = mouse.screen
-                local tag = awful.tag.gettags(screen)[i]
-                if tag then
-                   awful.tag.viewtoggle(tag)
-                end
-            end
-        ),
-        -- Move client to tag.
-        awful.key(
-            {modkey, "Shift"},
-            "#" .. i + 9,
-            function()
-                if client.focus then
-                    local tag = awful.tag.gettags(client.focus.screen)[i]
-                    if tag then
-                        awful.client.movetotag(tag)
-                    end
-               end
-            end
-        ),
-        -- Toggle tag.
-        awful.key(
-            {modkey, "Control", "Shift"},
-            "#" .. i + 9,
-            function()
-                if client.focus then
-                    local tag = awful.tag.gettags(client.focus.screen)[i]
-                    if tag then
-                        awful.client.toggletag(tag)
-                    end
-                end
-            end
-        )
+                end,
+                {description = "move focused client to tag #"..i,
+                 group = "tag"}),
+      -- Toggle tag on focused client.
+      awful.key({modkey, "Control", "Shift"}, "#" .. i + 9,
+                function()
+                  if client.focus then
+                    local tag = client.focus.screen.tags[i]
+                    if tag then client.focus:toggle_tag(tag) end
+                  end
+                end,
+                {description = "toggle focused client on tag #" .. i,
+                 group = "tag"})
     )
 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
@@ -658,128 +535,175 @@ root.keys(globalkeys)
 -- {{{ Rules
 -- Rules to apply to new clients (through the "manage" signal).
 awful.rules.rules = {
-    -- All clients will match this rule.
-    {
-        rule = {},
-        properties = {
-            border_width = beautiful.border_width,
-            border_color = beautiful.border_normal,
-            size_hints_honor = false,
-            focus = awful.client.focus.filter,
-            raise = true,
-            keys = clientkeys,
-            buttons = clientbuttons
-        }
+  -- All clients will match this rule.
+  {rule = {},
+   properties = {
+     border_width = beautiful.border_width,
+     border_color = beautiful.border_normal,
+     focus = awful.client.focus.filter,
+     raise = true,
+     keys = clientkeys,
+     buttons = clientbuttons,
+     screen = awful.screen.preferred,
+     placement = awful.placement.no_overlap + awful.placement.no_offscreen,
+     size_hints_honor = false
+   }},
+
+  -- Floating clients.
+  {rule_any = {
+    instance = {
+      "DTA",  -- Firefox addon DownThemAll.
+      "copyq",  -- Includes session name in class.
+    },
+    class = {
+      "Arandr",
+      "Gpick",
+      "Gcolor2",
+      "Kruler",
+      "MessageWin",  -- kalarm.
+      "Sxiv",
+      "Torbrowser-launcher",
+      "Twf",
+      "Wpa_gui",
+      "ac_client",
+      "flare",
+      "pinentry",
+      "veromix",
+      "xtightvncviewer"
     },
-    --{rule = {class = "MPlayer"}, properties = {floating = true}},
-    --{rule = {class = "pinentry"}, properties = {floating = true}},
-    --{rule = {class = "gimp"}, properties = {floating = true}},
-    {rule = {class = "Gcolor2"}, properties = {floating = true}},
-    {rule = {class = "flare"}, properties = {floating = true}},
-    {rule = {class = "Torbrowser-launcher"}, properties = {floating = true}},
-    {rule = {class = "Twf"}, properties = {floating = true}},
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    --{rule = {class = "Firefox"}, properties = {tag = tags[1][2]}},
+    name = {
+      "Event Tester"  -- xev.
+    },
+    role = {
+      "AlarmWindow",  -- Thunderbird's calendar.
+      "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
+    },
+   }, properties = {floating = true}},
+
+  -- Add titlebars to normal clients and dialogs
+  {rule_any = {type = {"normal", "dialog"}},
+   properties = {titlebars_enabled = true}}
+
+  -- Set Firefox to always map on the tag named "2" on screen 1.
+  -- {rule = {class = "Firefox"},
+  --   properties = {screen = 1, tag = "2"}}
 }
 -- }}}
 
 -- {{{ Signals
--- Signal functionto execute when a new client appears.
+-- Signal function to execute when a new client appears.
 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
-    elseif not c.size_hints.user_position
-            and not c.size_hints.program_position then
-        -- Prevent clients from being unreachable after screen count change
-        awful.placement.no_offscreen(c)
+  "manage",
+  function(c)
+  -- Set the windows at the slave,
+  -- i.e. put it at the end of others instead of setting it master.
+  -- if not awesome.startup then awful.client.setslave(c) end
+    if awesome.startup and
+       not c.size_hints.user_position and
+       not c.size_hints.program_position then
+      -- Prevent clients from being unreachable after screen count changes.
+      awful.placement.no_offscreen(c)
     end
+  end
+)
 
-    local titlebars_enabled = true
-    if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
-        -- buttons for the titlebar
-        local 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
-            )
-        )
-
-        -- Widgets that are aligned to the right
-        local right_layout = wibox.layout.fixed.horizontal()
-        --right_layout:add(awful.titlebar.widget.iconwidget(c))
-        right_layout:buttons(buttons)
-
-        -- Widgets that are aligned to the left
-        local left_layout = wibox.layout.fixed.horizontal()
-        left_layout:add(awful.titlebar.widget.closebutton(c))
-        left_layout:add(awful.titlebar.widget.ontopbutton(c))
-        left_layout:add(awful.titlebar.widget.stickybutton(c))
-        left_layout:add(awful.titlebar.widget.maximizedbutton(c))
-        left_layout:add(awful.titlebar.widget.floatingbutton(c))
-
-        -- The title goes in the middle
-        local middle_layout = wibox.layout.flex.horizontal()
-        --local title = awful.titlebar.widget.titlewidget(c)
-        --title:set_align("center")
-        --middle_layout:add(title)
-        middle_layout:buttons(buttons)
-
-        -- Now bring it all together
-        local layout = wibox.layout.align.horizontal()
-        layout:set_left(left_layout)
-        layout:set_right(right_layout)
-        layout:set_middle(middle_layout)
-
-        awful.titlebar(c, {size = "6"}):set_widget(layout)
-    end
+-- Add a titlebar if titlebars_enabled is set to true in the rules.
+client.connect_signal(
+  "request::titlebars",
+  function(c)
+    -- buttons for the titlebar
+    local 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)
+    )
 
-    if not awful.client.floating.get(c) then
-        awful.titlebar.hide(c)
+    awful.titlebar(c, {size=22}) : setup {
+      { -- Left
+        awful.titlebar.widget.closebutton(c),
+        awful.titlebar.widget.ontopbutton(c),
+        awful.titlebar.widget.stickybutton(c),
+        awful.titlebar.widget.maximizedbutton(c),
+        awful.titlebar.widget.floatingbutton(c),
+        layout  = wibox.layout.fixed.horizontal
+      },
+      { -- Middle
+        { -- Title
+          align  = "center",
+          widget = awful.titlebar.widget.titlewidget(c)
+        },
+        buttons = buttons,
+        layout  = wibox.layout.flex.horizontal
+      },
+      { -- Right
+        awful.titlebar.widget.iconwidget(c),
+        buttons = buttons,
+        layout = wibox.layout.fixed.horizontal
+      },
+      layout = wibox.layout.align.horizontal
+    }
+
+    -- Show titlebar if client is floating, hide otherwise.
+    if not c.floating and
+       awful.screen.focused().selected_tag.layout ~=
+       awful.layout.suit.floating then
+      awful.titlebar.hide(c)
     end
-end)
+  end
+)
 
+-- Show titlebar if client is floating, hide otherwise.
 client.connect_signal(
-    "focus",
-    function(c) c.border_color = beautiful.border_focus end
+  "property::floating",
+  function(c)
+    if c.first_tag == nil then
+      end
+    if c.floating or
+       (c.first_tag ~= nil and
+        c.first_tag.layout == awful.layout.suit.floating) then
+      awful.titlebar.show(c)
+    else
+      awful.titlebar.hide(c)
+    end
+  end
 )
+
+-- Enable sloppy focus, so that focus follows mouse.
 client.connect_signal(
-    "unfocus",
-    function(c) c.border_color = beautiful.border_normal end
+  "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
+)
+
+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)
+
+-- Show titlebar if client is floating, hide otherwise.
+tag.connect_signal(
+  "property::layout",
+  function(t)
+    if t.layout == awful.layout.suit.floating then
+      for _, c in pairs(t:clients()) do awful.titlebar.show(c) end
+    else
+      for _, c in pairs(t:clients()) do
+        if not c.floating then awful.titlebar.hide(c) end
+      end
+    end
+  end
 )
 -- }}}