import debian/upstream rc.lua changes

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

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index c0693e8790bcd9e9ed67d75a3e88f60542440a5f..81f547672e06edd7ffe1d3a5f83edde63c86c974 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -7,13 +7,24 @@ require("awful.autofocus")
 local wibox = require("wibox")
 -- Theme handling library
 local beautiful = require("beautiful")
 local wibox = require("wibox")
 -- Theme handling library
 local beautiful = require("beautiful")

+local xrdb = beautiful.xresources

 -- Notification library
 local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
 -- Notification library
 local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup").widget

+-- Enable hotkeys help widget for VIM and other apps
+-- when client with a matching name is opened:
+require("awful.hotkeys_popup.keys")
+
+-- Load Debian menu entries
+local debian = require("debian.menu")
+local has_fdo, freedesktop = pcall(require, "freedesktop")
+-- Other libraries
+local tblutils = require("tblutils")

 local lain = require("lain")
 local dkjson = require("lain.util").dkjson
 local math = require("math")
 local lain = require("lain")
 local dkjson = require("lain.util").dkjson
 local math = require("math")

+local luatz = require("luatz")

 -- }}}
 
 -- {{{ Error handling
 -- }}}
 
 -- {{{ Error handling


@@ -42,12 +53,16 @@ end
 -- }}}
 
 -- {{{ Variable definitions
 -- }}}
 
 -- {{{ Variable definitions

--- Themes define colours, icons, and wallpapers
-beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
+--xrdb.set_dpi(95, screen[1])
+--xrdb.set_dpi(120, screen[2])
+
+-- Themes define colours, icons, font and wallpapers.
+beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
+beautiful.font = 'Sans 10'

 
 -- 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 = "sensible-editor"
+editor = os.getenv("EDITOR") or "editor"

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


@@ -97,34 +112,19 @@ local function client_menu_toggle_fn()
     end
 end
 
     end
 end
 

-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
-
-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))
+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
         end

+        gears.wallpaper.maximized(wallpaper, s, true)

     end
 end
 
     end
 end
 

-local lain_bat = lain.widgets.bat({
+local lain_bat = lain.widget.bat({

     batteries = {"BAT0", "BAT1"},
     settings = function()
         local delim = "↓"
     batteries = {"BAT0", "BAT1"},
     settings = function()
         local delim = "↓"


@@ -142,7 +142,7 @@ local function poloniex_price(output, pair, prec)
     return (not err and val) or "n/a"
 end
 
     return (not err and val) or "n/a"
 end
 

-local eth_widget = lain.widgets.abase({
+local eth_widget = lain.widget.watch({

     cmd = "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'",
     timeout = 600,
     settings = function()
     cmd = "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'",
     timeout = 600,
     settings = function()


@@ -158,14 +158,13 @@ local function coindesk_price(output, base, prec)
     return (not err and val) or "n/a"
 end
 
     return (not err and val) or "n/a"
 end
 

-local btc_widget = lain.widgets.abase({
+local btc_widget = lain.widget.watch({

     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
 })
     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
 })

-

 -- }}}
 
 -- {{{ Menu
 -- }}}
 
 -- {{{ Menu


@@ -175,34 +174,61 @@ myawesomemenu = {
    { "manual", terminal .. " -e man awesome" },
    { "edit config", editor_cmd .. " " .. awesome.conffile },
    { "restart", awesome.restart },
    { "manual", terminal .. " -e man awesome" },
    { "edit config", editor_cmd .. " " .. awesome.conffile },
    { "restart", awesome.restart },

-   { "quit", awesome.quit }
+   { "quit", function() awesome.quit() end}

 }
 
 }
 

-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
+local menu_awesome = { "awesome", myawesomemenu, beautiful.awesome_icon }
+local menu_terminal = { "open terminal", terminal }
+
+if has_fdo then
+    mymainmenu = freedesktop.menu.build({
+        before = { menu_awesome },
+        after =  { menu_terminal }
+    })
+else
+    mymainmenu = awful.menu({
+        items = {
+                  menu_awesome,
+                  { "Debian", debian.menu.Debian_menu.Debian },
+                  menu_terminal,
+                }
+    })
+end
+

 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })
 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })

--- }}}

 
 

--- {{{ Menubar configuration
+-- Menubar configuration

 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
 -- }}}
 
 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
 -- }}}
 

--- {{{ Wibox
+-- {{{ Wibar

 local spacer = wibox.widget.textbox()
 local spacer = wibox.widget.textbox()

-spacer:set_text(' | ')
+spacer:set_text(' │ ')
+
+-- Keyboard map indicator and switcher
+mykeyboardlayout = awful.widget.keyboardlayout()
+

 -- Create a textclock widget
 -- Create a textclock widget

-mytextclock = wibox.widget.textclock("%a %d %b %H:%M:%S", 1)
+clocks = { wibox.widget.textclock("%a %d %b %H:%M:%S %Z", 1) }
+
+ZONES = {
+  ["NZ"] = "Pacific/Auckland",
+  ["DE"] = "Europe/Berlin"
+}
+local now = luatz.time_in(nil)
+for c, tz in tblutils.sorted_pairs(ZONES) do
+    local t = luatz.time_in(tz)
+    if math.abs(os.difftime(t, now)) > 10 then
+        local widget = wibox.widget.textclock(c .. ": %H:%M (%a)", 60, tz)
+        table.insert(clocks, 1, spacer)
+        table.insert(clocks, 1, widget)
+    end
+end

 
 -- Create a wibox for each screen and add it
 
 -- Create a wibox for each screen and add it

-mywibox = {}
-mypromptbox = {}
-mylayoutbox = {}
-mytaglist = {}
-mytaglist.buttons = awful.util.table.join(
+local taglist_buttons = gears.table.join(

                     awful.button({ }, 1, function(t) t:view_only() end),
                     awful.button({ modkey }, 1, function(t)
                                               if client.focus then
                     awful.button({ }, 1, function(t) t:view_only() end),
                     awful.button({ modkey }, 1, function(t)
                                               if client.focus then


@@ -219,8 +245,7 @@ mytaglist.buttons = awful.util.table.join(
                     awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
                 )
 
                     awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
                 )
 

-mytasklist = {}
-mytasklist.buttons = awful.util.table.join(
+local tasklist_buttons = gears.table.join(

                      awful.button({ }, 1, function (c)
                                               if c == client.focus then
                                                   -- I don't like click-minimising
                      awful.button({ }, 1, function (c)
                                               if c == client.focus then
                                                   -- I don't like click-minimising


@@ -247,6 +272,9 @@ mytasklist.buttons = awful.util.table.join(
                                           end))
 -- }}}
 
                                           end))
 -- }}}
 

+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+screen.connect_signal("property::geometry", set_wallpaper)
+

 -- {{{ Tags
 tags = {}
 tags.config = {}
 -- {{{ Tags
 tags = {}
 tags.config = {}


@@ -283,20 +311,13 @@ elseif screen.count() == 3 then -- main screen is still #1 in the middle
 end
 
 awful.screen.connect_for_each_screen(function(s)
 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
+    -- local fontsize = math.floor(250 * xrdb.get_dpi(s)/s.geometry.width)
+    -- beautiful.font = "Sans " .. tostring(fontsize)

 
     if not tags[s.index] then
         tags[s.index] = {}
     end
 
     if not tags[s.index] then
         tags[s.index] = {}
     end

-    for n,p in sorted_pairs(screentags[s.index]) do
+    for n,p in tblutils.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))
         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))


@@ -331,23 +352,27 @@ awful.screen.connect_for_each_screen(function(s)
             mypromptbox[s],
         },
         mytasklist[s], -- Middle widget
             mypromptbox[s],
         },
         mytasklist[s], -- Middle widget

-        { -- Right widgets
-            layout = wibox.layout.fixed.horizontal,
-            mykeyboardlayout,
-            wibox.widget.systray(),
-            btc_widget,
-            spacer,
-            lain_bat.widget,
-            spacer,
-            mytextclock,
-            mylayoutbox[s],
-        },
+        awful.util.table.join( -- Right widgets
+            {
+                layout = wibox.layout.fixed.horizontal,
+                mykeyboardlayout,
+                wibox.widget.systray(),
+                btc_widget,
+                spacer,
+                lain_bat.widget,
+                spacer,
+            },
+            clocks,
+            {
+                mylayoutbox[s],
+            }
+        ),

     }
 end)
 -- }}}
 
 -- {{{ Mouse bindings
     }
 end)
 -- }}}
 
 -- {{{ Mouse bindings

-root.buttons(awful.util.table.join(
+root.buttons(gears.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)


@@ -355,7 +380,7 @@ root.buttons(awful.util.table.join(
 -- }}}
 
 -- {{{ Key bindings
 -- }}}
 
 -- {{{ Key bindings

-globalkeys = awful.util.table.join(
+globalkeys = gears.table.join(

     awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
               {description="show help", group="awesome"}),
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
     awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
               {description="show help", group="awesome"}),
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev,


@@ -437,15 +462,17 @@ globalkeys = awful.util.table.join(
               {description = "restore minimized", group = "client"}),
 
     -- Prompt
               {description = "restore minimized", group = "client"}),
 
     -- Prompt

-    awful.key({ modkey },            "r",     function () mypromptbox[awful.screen.focused()]:run() end,
+    awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,

               {description = "run prompt", group = "launcher"}),
 
     awful.key({ modkey }, "x",
               function ()
               {description = "run prompt", group = "launcher"}),
 
     awful.key({ modkey }, "x",
               function ()

-                  awful.prompt.run({ prompt = "Run Lua code: " },
-                  mypromptbox[awful.screen.focused()].widget,
-                  awful.util.eval, nil,
-                  awful.util.get_cache_dir() .. "/history_eval")
+                  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"}),
     -- Menubar
               end,
               {description = "lua execute prompt", group = "awesome"}),
     -- Menubar


@@ -453,7 +480,7 @@ globalkeys = awful.util.table.join(
               {description = "show the menubar", group = "launcher"})
 )
 
               {description = "show the menubar", group = "launcher"})
 )
 

-clientkeys = awful.util.table.join(
+clientkeys = gears.table.join(

     awful.key({ modkey,           }, "f",
         function (c)
             c.fullscreen = not c.fullscreen
     awful.key({ modkey,           }, "f",
         function (c)
             c.fullscreen = not c.fullscreen


@@ -480,16 +507,30 @@ clientkeys = awful.util.table.join(
     awful.key({ modkey,           }, "m",
         function (c)
             c.maximized = not c.maximized
     awful.key({ modkey,           }, "m",
         function (c)
             c.maximized = not c.maximized

+            c.maximized_horizontal = false
+            c.maximized_vertical = false
+            c:raise()
+        end ,
+        {description = "(un)maximize", group = "client"}),
+    awful.key({ modkey, "Control" }, "m",
+        function (c)
+            c.maximized_vertical = not c.maximized_vertical

             c:raise()
         end ,
             c:raise()
         end ,

-        {description = "maximize", group = "client"})
+        {description = "(un)maximize vertically", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "m",
+        function (c)
+            c.maximized_horizontal = not c.maximized_horizontal
+            c:raise()
+        end ,
+        {description = "(un)maximize horizontally", group = "client"})

 )
 
 -- Bind all key numbers to tags.
 )
 
 -- Bind all key numbers to tags.

--- Be careful: we use keycodes to make it works on any keyboard layout.
+-- Be careful: we use keycodes to make it work on any keyboard layout.

 -- This should map on the top row of your keyboard, usually 1 to 9.
 for i = 1, 9 do
 -- 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 = gears.table.join(globalkeys,

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


@@ -500,7 +541,7 @@ for i = 1, 9 do
                         end
                   end,
                   {description = "view tag #"..i, group = "tag"}),
                         end
                   end,
                   {description = "view tag #"..i, group = "tag"}),

-        -- Toggle tag.
+        -- Toggle tag display.

         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()
                       local screen = awful.screen.focused()
         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()
                       local screen = awful.screen.focused()


@@ -535,7 +576,7 @@ for i = 1, 9 do
     )
 end
 
     )
 end
 

-clientbuttons = awful.util.table.join(
+clientbuttons = gears.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))


@@ -551,7 +592,7 @@ 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 }, "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 .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -DAs irc irssi") end),
+awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -As irc irssi") 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),
 
 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),
 


@@ -616,7 +657,7 @@ awful.rules.rules = {
 
     { rule = { class = "URxvt" },
                properties = {
 
     { rule = { class = "URxvt" },
                properties = {

-                   floating = false,
+                   -- floating = false,

                    size_hints_honor = false
                } },
     { rule = { class = "URxvt", instance = "irc" },
                    size_hints_honor = false
                } },
     { rule = { class = "URxvt", instance = "irc" },


@@ -665,7 +706,17 @@ awful.rules.rules = {
                    floating = false,
                },
            },
                    floating = false,
                },
            },

-    { rule = { class = "MuPDF", type = "mupdf" },
+    { rule = { class = "MuPDF", instance = "mupdf" },
+               properties = {
+                   floating = true,
+               },
+           },
+    { rule = { class = "Pinentry", instance = "pinentry" },
+               properties = {
+                   floating = true,
+               },
+           },
+    { rule = { class = "Gxmessage" },

                properties = {
                    floating = true,
                },
                properties = {
                    floating = true,
                },


@@ -678,7 +729,7 @@ awful.rules.rules = {
 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.
 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.

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

 
     if awesome.startup and
       not c.size_hints.user_position
 
     if awesome.startup and
       not c.size_hints.user_position


@@ -686,12 +737,15 @@ client.connect_signal("manage", function (c)
         -- Prevent clients from being unreachable after screen count changes.
         awful.placement.no_offscreen(c)
     end
         -- Prevent clients from being unreachable after screen count changes.
         awful.placement.no_offscreen(c)
     end

+
+    c.maximized_horizontal = false
+    c.maximized_vertical = false

 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
 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(
+    local buttons = gears.table.join(

         awful.button({ }, 1, function()
             client.focus = c
             c:raise()
         awful.button({ }, 1, function()
             client.focus = c
             c:raise()


@@ -730,7 +784,7 @@ client.connect_signal("request::titlebars", function(c)
     }
 end)
 
     }
 end)
 

--- Enable sloppy focus
+-- Enable sloppy focus, so that focus follows mouse.

 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.connect_signal("mouse::enter", function(c)
     if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
         and awful.client.focus.filter(c) then


@@ -742,7 +796,7 @@ client.connect_signal("focus", function(c) c.border_color = beautiful.border_foc
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
 awful.ewmh.add_activate_filter(function(c, context, hints)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
 awful.ewmh.add_activate_filter(function(c, context, hints)

-    if context == "ewmh" and c.class == "Firefox-esr" or c.class == "Firefox" then return false end
+    if context == "ewmh" and (c.class == "Firefox-esr" or c.class == "Firefox") then return false end

 end)
 
 -- vim:ft=lua:sw=4:sts=4:ts=4:et
 end)
 
 -- vim:ft=lua:sw=4:sts=4:ts=4:et