better battery indication

[etc/awesome.git] / .config / awesome / rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 26967cd61144d28a1f092d33df69a7b099225182..57e70c7396ccf304ddf4a22b6c48c8209d9dccca 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -1,24 +1,53 @@
+-- {{{ Imports

 -- Standard awesome library
 -- Standard awesome library

-require("awful")
-require("beautiful")
-require("naughty")
+local gears = require("gears")
+local awful = require("awful")
+require("awful.autofocus")
+-- 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")
+local hotkeys_popup = require("awful.hotkeys_popup").widget
+local lain = require("lain")
+local dkjson = require("lain.util").dkjson
+local math = require("math")
+-- }}}
+
+-- {{{ 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

 
 

--- Load Debian menu entries
-require("debian.menu")
+-- 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 = tostring(err) })
+        in_error = false
+    end)
+end
+-- }}}

 
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers

--- The default is a dark theme
-theme_path = "/usr/share/awesome/themes/default/theme.lua"
--- Uncommment this for a lighter theme
--- theme_path = "/usr/share/awesome/themes/sky/theme.lua"
-
--- Actually load theme
-beautiful.init(theme_path)
+beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")

 
 -- This is used later as the default terminal and editor to run.
 terminal = "x-terminal-emulator"
 
 -- This is used later as the default terminal and editor to run.
 terminal = "x-terminal-emulator"

-editor = os.getenv("EDITOR") or "editor"
+editor = "sensible-editor"

 editor_cmd = terminal .. " -e " .. editor
 
 -- Default modkey.
 editor_cmd = terminal .. " -e " .. editor
 
 -- Default modkey.


@@ -27,118 +56,147 @@ editor_cmd = terminal .. " -e " .. editor
 -- 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"
 -- 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"

+cmdkey = "Mod3"

 
 -- Table of layouts to cover with awful.layout.inc, order matters.
 
 -- Table of layouts to cover with awful.layout.inc, order matters.

-layouts =
-{
+awful.layout.layouts = {
+    awful.layout.suit.fair,

     awful.layout.suit.tile,
     awful.layout.suit.tile,

-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
+    -- awful.layout.suit.tile.left,
+    -- awful.layout.suit.tile.bottom,

     awful.layout.suit.tile.top,
     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,

-    awful.layout.suit.max.fullscreen,
-    awful.layout.suit.magnifier,
-    awful.layout.suit.floating
+    -- 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,

 }
 
 }
 

--- Table of clients that should be set floating. The index may be either
--- the application class or instance. The instance is useful when running
--- a console app in a terminal like (Music on Console)
---    xterm -name mocp -e mocp
--- OVERRULED BY TILEDAPPS BELOW
-floatapps =
-{
-    -- by class
-    ["MPlayer"] = true,
-    ["pinentry"] = true,
-    ["GIMP"] = true,
-    ["twinkle"] = true,
-    ["Add-ons"] = true,
-    ["Play stream"] = true,
-}
+layout_default = awful.layout.layouts[1]
+layout_tiled = awful.layout.layouts[2]
+layout_maximised = awful.layout.layouts[4]
+layout_floating = awful.layout.layouts[5]
+-- }}}

 
 

--- Applications that should never float, assuming everything else floats
--- (by instance)
-tiledapps =
-{
-    ["urxvt"] = true,
-}
+-- {{{ Helper functions
+local function client_menu_toggle_fn()
+    local instance = nil

 
 

--- Applications that should be maximised
--- (by instance)
-maxapps =
-{
-    ["Navigator"] = true,
-    -- jpilot is -v
-    ["-v"] = true,
-    ["Xpdf"] = true,
-    ["gscan2pdf"] = true
-}
+    return function ()
+        if instance and instance.wibox.visible then
+            instance:hide()
+            instance = nil
+        else
+            instance = awful.menu.clients({ theme = { width = 250 } })
+        end
+    end
+end

 
 

--- Applications to be moved to a pre-defined tag by class or instance.
--- Use the screen and tags indices.
-apptags =
-{
-    ["Navigator"] = { screen = 1, tag = 9 },
-    -- jpilot is -v
-    ["-v"] = { screen = 1, tag = 8 },
-}
+local function sorted_pairs(t, f)
+    local a = {}
+    for n in pairs(t) do table.insert(a, n) end
+    table.sort(a, f)
+    local i = 0      -- iterator variable
+    local iter = function ()   -- iterator function
+        i = i + 1
+        if a[i] == nil then return nil
+        else return a[i], t[a[i]]
+        end
+    end
+    return iter
+end

 
 

--- Define if we want to use titlebar on all applications.
-use_titlebar = false
--- }}}
+local function print_table(tbl, indent)
+    if not indent then indent = 0 end
+    for k, v in pairs(tbl) do
+        formatting = string.rep("  ", indent) .. k .. ": "
+        if type(v) == "table" then
+            print(formatting)
+            print_table(v, indent+1)
+        else
+            print(formatting .. tostring(v))
+        end
+    end
+end

 
 

--- {{{ Tags
--- Define tags table.
-tags = {}
-for s = 1, screen.count() do
-    -- Each screen has its own tag table.
-    tags[s] = {}
-    -- Create 9 tags per screen.
-    for tagnumber = 1, 9 do
-        tags[s][tagnumber] = tag(tagnumber)
-        -- split at 0.5/50% exactly
-        tags[s][tagnumber].mwfact = 0.5
-        -- Add tags to screen one by one
-        tags[s][tagnumber].screen = s
-        awful.layout.set(layouts[5], tags[s][tagnumber])
+local lain_bat = lain.widgets.bat({
+    batteries = {"BAT0", "BAT1"},
+    settings = function()
+        local delim = "↓"
+        if bat_now.status == "Charging" then delim = "↑"
+        elseif bat_now.status == "Unknown" then delim = "٭" end
+        widget:set_text(bat_now.perc .. "% " .. delim .. " " .. bat_now.time)
+    end,
+})
+
+local function poloniex_price(output, pair, prec)
+    local xc, pos, err = dkjson.decode(output, 1, nil)
+    if not prec then prec = 4 end
+    val = (xc and xc[pair]["last"]) or 0
+    val = math.floor(val*10^prec+0.5)/10^prec
+    return (not err and val) or "n/a"
+end
+
+local eth_widget = lain.widgets.abase({
+    cmd = "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'",
+    timeout = 600,
+    settings = function()
+        widget:set_text(poloniex_price(output, 'BTC_ETH') .. " Ƀ/Ξ")

     end
     end

-    -- I'm sure you want to see at least one tag.
-    tags[s][1].selected = true
+})
+
+local function coindesk_price(output, base, prec)
+    print(output)
+    local xc, pos, err = dkjson.decode(output, 1, nil)
+    if not prec then prec = 4 end
+    val = (xc and xc["bpi"][base]["rate_float"]) or 0
+    val = math.floor(val*10^prec+0.5)/10^prec
+    return (not err and val) or "n/a"

 end
 end

--- }}}

 
 

--- {{{ Wibox
--- Create a textbox widget
-mytextbox = widget({ type = "textbox", align = "right" })
--- Set the default text in textbox
-mytextbox.text = "<b><small> " .. awesome.release .. " </small></b>"
+local btc_widget = lain.widgets.abase({
+    cmd = "curl -m5 -Ls 'https://api.coindesk.com/v1/bpi/currentprice/EUR.json'",
+    timeout = 600,
+    settings = function()
+        widget:set_text(coindesk_price(output, "EUR", 2) .. " €/Ƀ")
+    end
+})

 
 

--- Create a laucher widget and a main menu
+-- }}}
+
+-- {{{ Menu
+-- Create a launcher widget and a main menu

 myawesomemenu = {
 myawesomemenu = {

+   { "hotkeys", function() return false, hotkeys_popup.show_help end},

    { "manual", terminal .. " -e man awesome" },
    { "manual", terminal .. " -e man awesome" },

-   { "edit config", editor_cmd .. " " .. awful.util.getdir("config") .. "/rc.lua" },
+   { "edit config", editor_cmd .. " " .. awesome.conffile },

    { "restart", awesome.restart },
    { "quit", awesome.quit }
 }
 
    { "restart", awesome.restart },
    { "quit", awesome.quit }
 }
 

-mymainmenu = awful.menu.new({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                        { "open terminal", terminal },
-                                        { "Debian", debian.menu.Debian_menu.Debian }
-                                      }
-                            })
+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 })
                                      menu = mymainmenu })

+-- }}}

 
 

--- Create a systray
-mysystray = widget({ type = "systray", align = "right" })
+-- {{{ Menubar configuration
+menubar.utils.terminal = terminal -- Set the terminal for applications that require it
+-- }}}

 
 

--- Create textbox widgets
-mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" })
-mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" })
+-- {{{ Wibox
+local spacer = wibox.widget.textbox()
+spacer:set_text(' | ')
+-- Create a textclock widget
+mytextclock = wibox.widget.textclock("%a %d %b %H:%M:%S", 1)

 
 -- Create a wibox for each screen and add it
 mywibox = {}
 
 -- Create a wibox for each screen and add it
 mywibox = {}


@@ -146,93 +204,151 @@ mypromptbox = {}
 mylayoutbox = {}
 mytaglist = {}
 mytaglist.buttons = awful.util.table.join(
 mylayoutbox = {}
 mytaglist = {}
 mytaglist.buttons = awful.util.table.join(

-                    awful.button({ }, 1, awful.tag.viewonly),
-                    awful.button({ modkey }, 1, awful.client.movetotag),
-                    awful.button({ }, 3, function (tag) tag.selected = not tag.selected end),
-                    awful.button({ modkey }, 3, awful.client.toggletag),
-                    awful.button({ }, 4, awful.tag.viewnext),
-                    awful.button({ }, 5, awful.tag.viewprev)
-                    )
+                    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)
+                )
+

 mytasklist = {}
 mytasklist.buttons = awful.util.table.join(
                      awful.button({ }, 1, function (c)
 mytasklist = {}
 mytasklist.buttons = awful.util.table.join(
                      awful.button({ }, 1, function (c)

-                                              if not c:isvisible() then
-                                                  awful.tag.viewonly(c:tags()[1])
-                                              end
-                                              client.focus = c
-                                              c:raise()
-                                          end),
-                     awful.button({ }, 3, function ()
-                                              if instance then
-                                                  instance:hide()
-                                                  instance = nil
+                                              if c == client.focus then
+                                                  -- I don't like click-minimising
+                                                  -- c.minimized = true

                                               else
                                               else

-                                                  instance = awful.menu.clients({ width=250 })
+                                                  -- 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),
                                               end
                                           end),

+                     awful.button({ }, 3, client_menu_toggle_fn()),

                      awful.button({ }, 4, function ()
                                               awful.client.focus.byidx(1)
                      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)
                                           end),
                      awful.button({ }, 5, function ()
                                               awful.client.focus.byidx(-1)

-                                              if client.focus then client.focus:raise() end

                                           end))
                                           end))

+-- }}}
+
+-- {{{ Tags
+tags = {}
+tags.config = {}
+tags.config["main"] = {
+    t1 = { layout = layout_default, selected = true },
+    t2 = { layout = layout_default },
+    t3 = { layout = layout_tiled },
+    t4 = { layout = layout_tiled },
+    t5 = { layout = layout_tiled },
+    t6 = { layout = layout_floating },
+    t7 = { layout = layout_maximised },
+    t8 = { layout = layout_maximised },
+    t9 = { layout = layout_maximised },
+}
+tags.config["aux"] = {
+    t1 = { layout = layout_default, selected = true },
+    t2 = { layout = layout_default },
+    t3 = { layout = layout_tiled },
+    t4 = { layout = layout_floating },
+    t5 = { layout = layout_floating },
+    t6 = { layout = layout_floating },
+    t7 = { layout = layout_floating },
+    t8 = { layout = layout_floating },
+    t9 = { layout = layout_maximised },
+}
+
+screentags = {}
+screentags[1] = tags.config["main"]
+if screen.count() == 2 then -- aux screen is on the right
+  screentags[2] = tags.config["aux"]
+elseif screen.count() == 3 then -- main screen is still #1 in the middle
+  screentags[2] = tags.config["aux"]
+  screentags[3] = tags.config["aux"]
+end
+
+awful.screen.connect_for_each_screen(function(s)
+    -- Wallpaper
+    --DISABLED--if beautiful.wallpaper then
+    --DISABLED--    local wallpaper = beautiful.wallpaper
+    --DISABLED--    -- If wallpaper is a function, call it with the screen
+    --DISABLED--    if type(wallpaper) == "function" then
+    --DISABLED--        wallpaper = wallpaper(s)
+    --DISABLED--    end
+    --DISABLED--    gears.wallpaper.maximized(wallpaper, s, true)
+    --DISABLED--end
+
+    if not tags[s.index] then
+        tags[s.index] = {}
+    end
+    for n,p in sorted_pairs(screentags[s.index]) do
+        p["screen"] = s
+        n = string.sub(n, 2) -- remove leading 't' needed for syntax in table
+        table.insert(tags[s.index], awful.tag.add(n, p))
+    end

 
 

-for s = 1, screen.count() do

     -- Create a promptbox for each screen
     -- Create a promptbox for each screen

-    mypromptbox[s] = awful.widget.prompt({ align = "left" })
+    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.
     -- Create an imagebox widget which will contains an icon indicating which layout we're using.
     -- We need one layoutbox per screen.

-    mylayoutbox[s] = widget({ type = "imagebox", align = "right" })
+    mylayoutbox[s] = awful.widget.layoutbox(s)

     mylayoutbox[s]:buttons(awful.util.table.join(
     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)))
+                           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
     -- 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
 
     -- 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
 
     -- Create the wibox

-    mywibox[s] = wibox({ position = "top", fg = beautiful.fg_normal, bg = beautiful.bg_normal })
-    -- Add widgets to the wibox - order matters
-    mywibox[s].widgets = { mytaglist[s],
-                           mytasklist[s],
-                           mypromptbox[s],
-                           mybatterybox,
-                           mytimebox,
-                           mylayoutbox[s],
-                           s == screen.count() and mysystray or nil }
-    mywibox[s].screen = s
-end
--- }}}
-
---Battery widget
-batterywidget = widget({ type = 'progressbar', name = 'batterywidget' })
-batterywidget.width = 100
-batterywidget.height = 0.8
-batterywidget.gap = 1
-batterywidget.border_padding = 1
-batterywidget.border_width = 1
-batterywidget.ticks_count = 10
-batterywidget.ticks_gap = 1
-batterywidget.vertical = false
-batterywidget:bar_properties_set('bat', {
-  bg = 'black',
-  fg = 'blue4',
-  fg_off = 'red',
-  reverse = false,
-  min_value = 0,
-  max_value = 100
-})
+    mywibox[s] = awful.wibar({ position = "top", screen = s })
+
+    -- Add widgets to the wibox
+    mywibox[s]:setup {
+        layout = wibox.layout.align.horizontal,
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
+            -- mylauncher,
+            mytaglist[s],
+            mypromptbox[s],
+        },
+        mytasklist[s], -- Middle widget
+        { -- Right widgets
+            layout = wibox.layout.fixed.horizontal,
+            mykeyboardlayout,
+            wibox.widget.systray(),
+            btc_widget,
+            spacer,
+            eth_widget,
+            spacer,
+            lain_bat.widget,
+            spacer,
+            mytextclock,
+            mylayoutbox[s],
+        },
+    }
+end)

 -- }}}
 
 -- }}}
 

-

 -- {{{ Mouse bindings
 root.buttons(awful.util.table.join(
     awful.button({ }, 3, function () mymainmenu:toggle() end),
 -- {{{ Mouse bindings
 root.buttons(awful.util.table.join(
     awful.button({ }, 3, function () mymainmenu:toggle() end),


@@ -243,427 +359,379 @@ root.buttons(awful.util.table.join(
 
 -- {{{ Key bindings
 globalkeys = awful.util.table.join(
 
 -- {{{ 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,           }, "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",
+    awful.key({ modkey,           }, "k",

         function ()
             awful.client.focus.byidx( 1)
         function ()
             awful.client.focus.byidx( 1)

-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ modkey,           }, "k",
+        end,
+        {description = "focus next by index", group = "client"}
+    ),
+    awful.key({ modkey,           }, "j",

         function ()
             awful.client.focus.byidx(-1)
         function ()
             awful.client.focus.byidx(-1)

-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ modkey,           }, "w", function () mymainmenu:show(true)        end),
+        end,
+        {description = "focus previous by index", group = "client"}
+    ),
+    awful.key({ modkey,           }, "w", function () mymainmenu:show() end,
+              {description = "show main menu", group = "awesome"}),

 
     -- Layout manipulation
 
     -- 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( 1)       end),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus(-1)       end),
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
+    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx(  1)    end,
+              {description = "swap with next client by index", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx( -1)    end,
+              {description = "swap with previous client by index", group = "client"}),
+    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative( 1) end,
+              {description = "focus the next screen", group = "screen"}),
+    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative(-1) end,
+              {description = "focus the previous 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
     awful.key({ modkey,           }, "Tab",
         function ()
             awful.client.focus.history.previous()
             if client.focus then
                 client.focus:raise()
             end

-        end),
+        end,
+        {description = "go back", group = "client"}),

 
     -- Standard program
 
     -- Standard program

-    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,           }, "Return", function () awful.spawn(terminal) end,
+              {description = "open a terminal", group = "launcher"}),
+    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,           }, "space", function () awful.layout.inc( 1)                end,
+              {description = "select next", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "space", 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
 
     -- Prompt

-    awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
+    awful.key({ modkey },            "r",     function () mypromptbox[awful.screen.focused()]:run() end,
+              {description = "run prompt", group = "launcher"}),

 
     awful.key({ modkey }, "x",
               function ()
                   awful.prompt.run({ prompt = "Run Lua code: " },
 
     awful.key({ modkey }, "x",
               function ()
                   awful.prompt.run({ prompt = "Run Lua code: " },

-                  mypromptbox[mouse.screen].widget,
+                  mypromptbox[awful.screen.focused()].widget,

                   awful.util.eval, nil,
                   awful.util.eval, nil,

-                  awful.util.getdir("cache") .. "/history_eval")
-              end)
+                  awful.util.get_cache_dir() .. "/history_eval")
+              end,
+              {description = "lua execute prompt", group = "awesome"}),
+    -- Menubar
+    awful.key({ modkey }, "p", function() menubar.show() end,
+              {description = "show the menubar", group = "launcher"})

 )
 
 )
 

--- Client awful tagging: this is useful to tag some clients and then do stuff like move to tag on them

 clientkeys = awful.util.table.join(
 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", awful.client.togglemarked),
-    awful.key({ modkey,}, "m",
+    awful.key({ modkey,           }, "f",

         function (c)
         function (c)

---            if not awful.client.floating then
---                awful.client.floating.toggle()
---            end
-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
-        end)
+            c.fullscreen = not c.fullscreen
+            c:raise()
+        end,
+        {description = "toggle fullscreen", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end,
+              {description = "close", group = "client"}),
+    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
+              {description = "toggle floating", group = "client"}),
+    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
+              {description = "move to master", group = "client"}),
+    awful.key({ modkey,           }, "o",      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,           }, "m",
+        function (c)
+            c.maximized = not c.maximized
+            c:raise()
+        end ,
+        {description = "maximize", group = "client"})

 )
 
 )
 

--- 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));
-end
-
-for i = 1, keynumber do
+-- 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, 9 do

     globalkeys = awful.util.table.join(globalkeys,
     globalkeys = awful.util.table.join(globalkeys,

-        awful.key({ modkey }, i,
+        -- View tag only.
+        awful.key({ modkey }, "#" .. i + 9,

                   function ()
                   function ()

-                        local screen = mouse.screen
-                        if tags[screen][i] then
-                            awful.tag.viewonly(tags[screen][i])
+                        local screen = awful.screen.focused()
+                        local tag = screen.tags[i]
+                        if tag then
+                           tag:view_only()

                         end
                         end

-                  end),
-        awful.key({ modkey, "Control" }, i,
+                  end,
+                  {description = "view tag #"..i, group = "tag"}),
+        -- Toggle tag.
+        awful.key({ modkey, "Control" }, "#" .. i + 9,

                   function ()
                   function ()

-                      local screen = mouse.screen
-                      if tags[screen][i] then
-                          tags[screen][i].selected = not tags[screen][i].selected
+                      local screen = awful.screen.focused()
+                      local tag = screen.tags[i]
+                      if tag then
+                         awful.tag.viewtoggle(tag)

                       end
                       end

-                  end),
-        awful.key({ modkey, "Shift" }, i,
+                  end,
+                  {description = "toggle tag #" .. i, group = "tag"}),
+        -- Move client to tag.
+        awful.key({ modkey, "Shift" }, "#" .. i + 9,

                   function ()
                   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,
-                  function ()
-                      if client.focus and tags[client.focus.screen][i] then
-                          awful.client.toggletag(tags[client.focus.screen][i])
-                      end
-                  end),
-        awful.key({ modkey, "Shift" }, "F" .. i,
+                      if client.focus then
+                          local tag = client.focus.screen.tags[i]
+                          if tag then
+                              client.focus:move_to_tag(tag)
+                          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 ()
                   function ()

-                      local screen = mouse.screen
-                      if tags[screen][i] then
-                          for k, c in pairs(awful.client.getmarked()) do
-                              awful.client.movetotag(tags[screen][i], c)
+                      if client.focus then
+                          local tag = client.focus.screen.tags[i]
+                          if tag then
+                              client.focus:toggle_tag(tag)

                           end
                       end
                           end
                       end

-                   end))
+                  end,
+                  {description = "toggle focused client on tag #" .. i, group = "tag"})
+    )

 end
 
 end
 

-cmdmodkey = "Mod3"
-
--- xmms2 & sound
-globalkeys = awful.util.table.join(globalkeys,
-  awful.key({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end),
-  awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end),
-  awful.key({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end),
-  awful.key({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end),
-  awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end),
-  awful.key({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end),
-  awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end),
-  awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end),
-  awful.key({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end),
-  awful.key({ cmdmodkey }, "backslash", function () awful.util.spawn("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end),
-  awful.key({ cmdmodkey, "Shift" }, "backslash", function () awful.util.spawn("xmms2 list | xmessage -nearmouse -timeout 5 -file -") 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))

 
 -- misc apps
 globalkeys = awful.util.table.join(globalkeys,
 
 -- misc apps
 globalkeys = awful.util.table.join(globalkeys,

-  awful.key({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end),
-  awful.key({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end),
-  awful.key({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end),
-  awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end),
-  awful.key({ cmdmodkey }, "r", function () awful.util.spawn("gmrun") end),
-  awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end),
-  awful.key({ cmdmodkey }, "x", function () awful.util.spawn("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end),
-  awful.key({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end)
+awful.key({ cmdkey }, "n", function () awful.spawn("firefox") end),
+awful.key({ cmdkey }, "m", function () awful.spawn("chromium") end),
+awful.key({ cmdkey }, "y", function () awful.spawn(terminal .. " -e python") end),
+awful.key({ cmdkey }, "c", function () awful.spawn("icedove") end),
+awful.key({ cmdkey }, "r", function () mypromptbox[mouse.screen]:run() end),
+awful.key({ cmdkey }, "g", function () awful.spawn("gscan2pdf") end),
+awful.key({ cmdkey }, "v", function () awful.spawn("virt-manager") end),
+awful.key({ cmdkey }, "l", function () awful.spawn("libreoffice") end),
+awful.key({ cmdkey }, "f", function () awful.spawn("thunar") end),
+awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -title irc -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host screen -dr irc") end),
+awful.key({ cmdkey }, "x", function () awful.spawn.with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver -- -no-capture-stderr; sleep 2; xscreensaver-command -lock") end),
+awful.key({ cmdkey, "Shift" }, "x", function () awful.spawn("xscreensaver-command -exit") end),
+
+-- function keys
+awful.key(nil, "XF86ScreenSaver", function () awful.spawn("xset dpms force off") end),
+awful.key(nil, "XF86AudioMute", function () awful.spawn("pactl set-sink-mute 0 toggle") end),
+awful.key({ cmdkey }, "End", function () awful.spawn("pactl set-sink-mute 0 toggle") end),
+awful.key(nil, "XF86AudioLowerVolume", function () awful.spawn("pactl set-sink-volume 0 -2%") end),
+awful.key({ cmdkey }, "Next", function () awful.spawn("pactl set-sink-volume 0 -2%") end),
+awful.key(nil, "XF86AudioRaiseVolume", function () awful.spawn("pactl set-sink-volume 0 +2%") end),
+awful.key({ cmdkey }, "Prior", function () awful.spawn("pactl set-sink-volume 0 +2%") end),
+awful.key(nil, "XF86AudioMicMute", function () awful.spawn("pactl set-source-mute 1 toggle") end),
+awful.key({ cmdkey }, "Home", function () awful.spawn("pactl set-source-mute 1 toggle") end),
+awful.key(nil, "XF86MonBrightnessDown", function () awful.spawn("xbacklight -dec 5%") end),
+awful.key(nil, "XF86MonBrightnessUp", function () awful.spawn("xbacklight -inc 5%") end),
+awful.key(nil, "XF86Display", function () awful.spawn("") end),
+awful.key(nil, "XF86WLAN", function () awful.spawn("") end),
+awful.key(nil, "XF86Tools", function () awful.spawn("") end),
+awful.key(nil, "XF86Search", function () awful.spawn("") end),
+awful.key(nil, "XF86LaunchA", function () awful.spawn("") end),
+awful.key(nil, "XF86Explorer", function () awful.spawn("") end)

 )
 
 -- Set keys
 root.keys(globalkeys)
 -- }}}
 
 )
 
 -- Set keys
 root.keys(globalkeys)
 -- }}}
 

--- {{{ Hooks
--- Hook function to execute when focusing a client.
-awful.hooks.focus.register(function (c)
-    if not awful.client.ismarked(c) then
-        c.border_color = beautiful.border_focus
-    end
-end)
-
--- Hook function to execute when unfocusing a client.
-awful.hooks.unfocus.register(function (c)
-    if not awful.client.ismarked(c) then
-        c.border_color = beautiful.border_normal
-    end
-end)
-
--- Hook function to execute when marking a client
-awful.hooks.marked.register(function (c)
-    c.border_color = beautiful.border_marked
-end)
-
--- Hook function to execute when unmarking a client.
-awful.hooks.unmarked.register(function (c)
-    c.border_color = beautiful.border_focus
-end)
-
--- Hook function to execute when the mouse enters a client.
-awful.hooks.mouse_enter.register(function (c)
-    -- Sloppy focus, but disabled for magnifier layout
-    if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
-        and awful.client.focus.filter(c) then
-        client.focus = c
-    end
-end)
-
--- Hook function to execute when a new client appears.
-awful.hooks.manage.register(function (c, startup)
-    -- If we are not managing this application at startup,
-    -- move it to the screen where the mouse is.
-    -- We only do it for filtered windows (i.e. no dock, etc).
-    if not startup and awful.client.focus.filter(c) then
-        c.screen = mouse.screen
-    end
-
-    if use_titlebar then
-        -- Add a titlebar
-        awful.titlebar.add(c, { modkey = modkey })
-    end
-    -- Add mouse bindings
-    c: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)
-    ))
-    -- New client may not receive focus
-    -- if they're not focusable, so set border anyway.
-    c.border_width = beautiful.border_width
-    c.border_color = beautiful.border_normal
-
-    -- Check if the application should be floating.
-    -- OVERRIDDEN, SEE tiledapps BELOW
-    local cls = c.class
-    local inst = c.instance
-    if floatapps[cls] then
-        awful.client.floating.set(c, floatapps[cls])
-    elseif floatapps[inst] then
-        awful.client.floating.set(c, floatapps[inst])
-    end
-
-    -- Override with tiledapps
-    awful.client.floating.set(c, not (tiledapps[inst] or tiledapps[cls]))
+-- {{{ Rules
+-- Rules to apply to new clients (through the "manage" signal).

 
 

-    -- Check application->screen/tag mappings.
-    local target
-    if apptags[cls] then
-        target = apptags[cls]
-    elseif apptags[inst] then
-        target = apptags[inst]
+local function move_to_tag(s, t)
+    return function(c)
+        c:move_to_tag(tags[s][t])

     end
     end

-    if target then
-        c.screen = target.screen
-        awful.client.movetotag(tags[target.screen][target.tag], c)
-    end
-
-    -- Do this after tag mapping, so you don't see it on the wrong tag for a split second.
-    client.focus = c
+end

 
 

-    -- Set key bindings
-    c:keys(clientkeys)
+awful.rules.rules = {
+    -- 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,
+                     floating = true
+                 },
+    },
+
+    -- Add titlebars to normal clients and dialogs
+    --DISABLED-- { rule_any = {type = { "normal", "dialog" }
+    --DISABLED--  }, properties = { titlebars_enabled = true }
+    --DISABLED-- },
+
+    { rule = { type = "dialog" },
+      properties = { placement = awful.placement.centered }},
+
+    { rule = { class = "URxvt" },
+               properties = {
+                   floating = false,
+                   size_hints_honor = false
+               } },
+    { rule = { class = "URxvt", instance = "irc" },
+               properties = {
+                   switchtotag = true
+               },
+               callback = move_to_tag(screen.count(), screen.count() == 1 and 2 or 1)
+           },
+    { rule = { class = "Firefox", instance = "Navigator" },
+               properties = {
+                   floating = false,
+               },
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
+           },
+    { rule = { class = "Icedove", instance = "Mail" },
+               properties = {
+                   floating = false,
+               },
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 8)
+           },
+    { rule = { class = "Chromium", instance = "chromium" },
+               properties = {
+                   floating = false,
+               },
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
+           },
+    { rule = { class = "Gscan2pdf" },
+               properties = {
+                   switchtotag = true
+               },
+               callback = move_to_tag(1, 5)
+           },
+    { rule = { name = "gscan2pdf .*" },
+               properties = {
+                   floating = false,
+               },
+           },
+    { rule = { class = "Thunar", type = "normal" },
+               properties = {
+                   floating = false,
+               },
+           },
+}
+-- }}}

 
 

+-- {{{ Signals
+-- Signal function to execute when a new client appears.
+client.connect_signal("manage", function (c)

     -- Set the windows at the slave,
     -- i.e. put it at the end of others instead of setting it master.
     -- Set the windows at the slave,
     -- i.e. put it at the end of others instead of setting it master.

-    -- awful.client.setslave(c)
+    -- if not awesome.startup then awful.client.setslave(c) end

 
 

-    -- Honor size hints: if you want to drop the gaps between windows, set this to false.
-    c.size_hints_honor = true
-
-    -- Maximise some
-    if maxapps[inst] or maxapps[cls] then
-        c.maximized_horizontal = not c.maximized_horizontal
-        c.maximized_vertical   = not c.maximized_vertical
-    end
-end)
-
--- Hook function to execute when arranging the screen.
--- (tag switch, new client, etc)
-awful.hooks.arrange.register(function (screen)
-    local layout = awful.layout.getname(awful.layout.get(screen))
-    if layout and beautiful["layout_" ..layout] then
-        mylayoutbox[screen].image = image(beautiful["layout_" .. layout])
-    else
-        mylayoutbox[screen].image = nil
-    end
-
-    -- Give focus to the latest client in history if no window has focus
-    -- or if the current window is a desktop or a dock one.
-    if not client.focus then
-        local c = awful.client.focus.history.get(screen, 0)
-        if c then client.focus = 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)
 
     end
 end)
 

--- Hook called every second
-awful.hooks.timer.register(1, function ()
-    mytimebox.text = os.date(" %a %d %b %H:%M:%S ")
+-- 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)
+    )
+
+    awful.titlebar(c) : setup {
+        { -- Left
+            awful.titlebar.widget.iconwidget(c),
+            buttons = buttons,
+            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.floatingbutton (c),
+            awful.titlebar.widget.maximizedbutton(c),
+            awful.titlebar.widget.stickybutton   (c),
+            awful.titlebar.widget.ontopbutton    (c),
+            awful.titlebar.widget.closebutton    (c),
+            layout = wibox.layout.fixed.horizontal()
+        },
+        layout = wibox.layout.align.horizontal
+    }

 end)
 
 end)
 

--- Hook called every sixty seconds
-function hook_battery()
-    mybatterybox.text = " " .. get_acpibatt() .. " "
-end
-
--- {{{ Statusbar battery
---
-function get_acpibatt()
-
-    local f = io.popen('acpi -b', 'r')
-    if not f then
-      return "acpi -b failed"
-    end
-
-    local s = f:read('*l')
-    f:close()
-    if not s then
-      return '-';
-    end
-
-    -- Battery 0: Discharging, 89%, 00:02:14 remaining
-    -- Battery 0: Charging, 58%, 00:02:14 until charged
-    -- Battery 0: Full, 100%
-    -- so find the first bit first and then go look for the time
-    local st, en, status, percent = string.find(s, '%a+%s%d:%s(%a+),%s(%d+%%)');
-    local st, en, time = string.find(s, ',%s(%d+:%d+):%d+%s%a+', en);
-
-    if not status or not percent then -- time can be empty if we're full
-      return "couldn't parse line " .. s
-    end
-
-    if not time then
-      return percent
-    end
-
-    if status == 'Charging' then
-      return '↑ ' .. percent;
-    elseif status == 'Discharging' then
-      return '↓ '.. time;
-    else
-      return '';
-    end
-end
--- }}}
-
---{{{ batt hook
-local function get_bat()
-  local a = io.open("/sys/class/power_supply/BAT1/charge_full")
-  for line in a:lines() do
-    full = line
-  end
-  a:close()
-  local b = io.open("/sys/class/power_supply/BAT1/charge_now")
-  for line in b:lines() do
-    now = line
-  end
-  b:close()
-  batt=math.floor(now*100/full)
-  batterywidget:bar_data_add("bat",batt )
-end
---}}}
-
--- Set up some hooks
-awful.hooks.timer.register(20, hook_battery)
--- awful.hooks.timer.register(5, get_bat)
--- }}}
-
--- Highlight statusbars on the screen that has focus,
--- set this to false if you only have one screen or
--- you don't like it :P
-if screen.count() > 1 then
-  statusbar_highlight_focus = true
-else
-  statusbar_highlight_focus = false
-end
-
-hook_battery()
-
-function displayMonth(month,year,weekStart)
-    local t,wkSt=os.time{year=year, month=month+1, day=0},weekStart or 1
-    local d=os.date("*t",t)
-    local mthDays,stDay=d.day,(d.wday-d.day-wkSt+1)%7
-
-    local lines = {}
-
-    for x=0,6 do
-        lines[x+1] = os.date("%a ",os.time{year=2006,month=1,day=x+wkSt})
-    end
-    lines[8] = "    "
-
-    local writeLine = 1
-    while writeLine < (stDay + 1) do
-        lines[writeLine] = lines[writeLine] .. "   "
-        writeLine = writeLine + 1
-    end
-
-    for x=1,mthDays do
-        if writeLine == 8 then
-            writeLine = 1
-        end
-        if writeLine == 1 or x == 1 then
-            lines[8] = lines[8] .. os.date(" %V",os.time{year=year,month=month,day=x})
-        end
-        if (#(tostring(x)) == 1) then
-            x = " " .. x
-        end
-        lines[writeLine] = lines[writeLine] .. " " .. x
-        writeLine = writeLine + 1
+-- Enable sloppy focus
+client.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

-    local header = os.date("%B %Y\n",os.time{year=year,month=month,day=1})
-    header = string.rep(" ", math.floor((#(lines[1]) - #header) / 2 )) .. header
+end)

 
 

-    return header .. table.concat(lines, '\n')
-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)

 
 

-local calendar = {}
-function switchNaughtyMonth(switchMonths)
-    if (#calendar < 3) then return end
-    local swMonths = switchMonths or 1
-    calendar[1] = calendar[1] + swMonths
-    calendar[3].box.widgets[2].text = displayMonth(calendar[1], calendar[2], 2)
-end
+awful.ewmh.add_activate_filter(function(c, context, hints)
+    if context == "ewmh" and c.class == "Firefox" then return false end
+end)

 
 

-mytimebox.mouse_enter = function ()
-    local month, year = os.date('%m'), os.date('%Y')
-    calendar = { month, year,
-                naughty.notify({
-                    text = displayMonth(month, year, 2),
-                    timeout = 0, hover_timeout = 0.5,
-                    width = 200, screen = mouse.screen
-                })
-               }
-end
-mytimebox.mouse_leave = function () naughty.destroy(calendar[3]) end
-
-mytimebox.buttons = awful.util.table.join(
-    awful.button({ }, 1, function() switchNaughtyMonth(-1) end),
-    awful.button({ }, 3, function() switchNaughtyMonth(1) end),
-    awful.button({ }, 4, function() switchNaughtyMonth(-1) end),
-    awful.button({ }, 5, function() switchNaughtyMonth(1) end),
-    awful.button({ 'Shift' }, 1, function() switchNaughtyMonth(-12) end),
-    awful.button({ 'Shift' }, 3, function() switchNaughtyMonth(12) end),
-    awful.button({ 'Shift' }, 4, function() switchNaughtyMonth(-12) end),
-    awful.button({ 'Shift' }, 5, function() switchNaughtyMonth(12) end)
-)
+-- vim:ft=lua:sw=4:sts=4:ts=4:et