make variables local

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

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 1b99deb8f6ce6d0046e99c44ca2850a30f798953..26d66cc67082daeb9952e59125b4f84042529fac 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -14,6 +14,8 @@ local hotkeys_popup = require("awful.hotkeys_popup").widget
 local lain = require("lain")
 local dkjson = require("lain.util").dkjson
 local math = require("math")
+local freedesktop = require("freedesktop")
+local luatz = require("luatz")
 -- }}}
 
 -- {{{ Error handling
@@ -124,7 +126,7 @@ local function print_table(tbl, indent)
     end
 end
 
-local lain_bat = lain.widgets.bat({
+local lain_bat = lain.widget.bat({
     batteries = {"BAT0", "BAT1"},
     settings = function()
         local delim = "↓"
@@ -142,7 +144,7 @@ local function poloniex_price(output, pair, prec)
     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()
@@ -158,7 +160,7 @@ local function coindesk_price(output, base, prec)
     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()
@@ -178,10 +180,14 @@ myawesomemenu = {
    { "quit", awesome.quit }
 }
 
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
+mymainmenu = freedesktop.menu.build({
+    before = {
+        { "awesome", myawesomemenu, beautiful.awesome_icon },
+        { "terminal", terminal },
+    },
+    after = {
+    }
+})
 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })
@@ -193,9 +199,23 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 
 -- {{{ Wibox
 local spacer = wibox.widget.textbox()
-spacer:set_text(' | ')
+spacer:set_text(' │ ')
 -- 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", 1) }
+
+ZONES = {
+  ["NZ"] = "Pacific/Auckland",
+  ["DE"] = "Europe/Berlin"
+}
+local now = luatz.time_in(nil)
+for c, tz in 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, spacer)
+        table.insert(clocks, widget)
+    end
+end
 
 -- Create a wibox for each screen and add it
 mywibox = {}
@@ -331,17 +351,21 @@ awful.screen.connect_for_each_screen(function(s)
             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)
 -- }}}
@@ -480,6 +504,8 @@ clientkeys = awful.util.table.join(
     awful.key({ modkey,           }, "m",
         function (c)
             c.maximized = not c.maximized
+            c.maximized_horizontal = false
+            c.maximized_vertical = false
             c:raise()
         end ,
         {description = "maximize", group = "client"})
@@ -551,7 +577,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 }, "i", function () awful.spawn(terminal .. " -title irc -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),
 
@@ -599,7 +625,7 @@ awful.rules.rules = {
                      buttons = clientbuttons,
                      screen = awful.screen.preferred,
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,
-                     floating = true
+                     floating = false
                  },
     },
 
@@ -609,11 +635,14 @@ awful.rules.rules = {
     --DISABLED-- },
 
     { rule = { type = "dialog" },
-      properties = { placement = awful.placement.centered }},
+      properties = { floating = true,
+                     placement = awful.placement.centered
+                 }
+    },
 
     { rule = { class = "URxvt" },
                properties = {
-                   floating = false,
+                   -- floating = false,
                    size_hints_honor = false
                } },
     { rule = { class = "URxvt", instance = "irc" },
@@ -628,6 +657,12 @@ awful.rules.rules = {
                },
                callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
+    { rule = { class = "Firefox-esr", instance = "Navigator" },
+               properties = {
+                   floating = false,
+               },
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
+           },
     { rule = { class = "Thunderbird", instance = "Mail" },
                properties = {
                    floating = false,
@@ -656,6 +691,21 @@ awful.rules.rules = {
                    floating = false,
                },
            },
+    { rule = { class = "MuPDF", instance = "mupdf" },
+               properties = {
+                   floating = true,
+               },
+           },
+    { rule = { class = "Pinentry", instance = "pinentry" },
+               properties = {
+                   floating = true,
+               },
+           },
+    { rule = { class = "Gxmessage" },
+               properties = {
+                   floating = true,
+               },
+           },
 }
 -- }}}
 
@@ -664,7 +714,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.
-    -- 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
@@ -672,6 +722,9 @@ client.connect_signal("manage", function (c)
         -- 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.
@@ -728,7 +781,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)
-    if context == "ewmh" and 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