factor out sorted_table helper function

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

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index c34be92bfcf66b21a19ebad809be83da448175e0..60c913358f82d8f397e63e50bbdb721545d9dc0f 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -7,13 +7,17 @@ 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

+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 freedesktop = require("freedesktop")
+local luatz = require("luatz")

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


@@ -42,8 +46,12 @@ end
 -- }}}
 
 -- {{{ Variable definitions
 -- }}}
 
 -- {{{ Variable definitions

+--xrdb.set_dpi(95, screen[1])
+--xrdb.set_dpi(120, screen[2])
+

 -- Themes define colours, icons, and wallpapers
 beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
 -- Themes define colours, icons, and wallpapers
 beautiful.init(awful.util.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"


@@ -97,34 +105,7 @@ 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))
-        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 +123,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,7 +139,7 @@ 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()
     cmd = "curl -m5 -Ls 'https://api.coindesk.com/v1/bpi/currentprice/EUR.json'",
     timeout = 600,
     settings = function()


@@ -178,10 +159,14 @@ myawesomemenu = {
    { "quit", awesome.quit }
 }
 
    { "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 })
 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })


@@ -193,9 +178,23 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 
 -- {{{ Wibox
 local spacer = wibox.widget.textbox()
 
 -- {{{ Wibox
 local spacer = wibox.widget.textbox()

-spacer:set_text(' | ')
+spacer:set_text(' │ ')

 -- 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
 mywibox = {}
 
 -- Create a wibox for each screen and add it
 mywibox = {}


@@ -283,6 +282,8 @@ 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)

+    -- local fontsize = math.floor(250 * xrdb.get_dpi(s)/s.geometry.width)
+    -- beautiful.font = "Sans " .. tostring(fontsize)

     -- Wallpaper
     --DISABLED--if beautiful.wallpaper then
     --DISABLED--    local wallpaper = beautiful.wallpaper
     -- Wallpaper
     --DISABLED--if beautiful.wallpaper then
     --DISABLED--    local wallpaper = beautiful.wallpaper


@@ -296,7 +297,7 @@ awful.screen.connect_for_each_screen(function(s)
     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,19 +332,21 @@ 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,
-            eth_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)
 -- }}}
     }
 end)
 -- }}}


@@ -482,6 +485,8 @@ 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 = "maximize", group = "client"})
             c:raise()
         end ,
         {description = "maximize", group = "client"})


@@ -545,7 +550,7 @@ clientbuttons = awful.util.table.join(
 -- misc apps
 globalkeys = awful.util.table.join(globalkeys,
 awful.key({ cmdkey }, "n", function () awful.spawn("firefox") end),
 -- misc apps
 globalkeys = awful.util.table.join(globalkeys,
 awful.key({ cmdkey }, "n", function () awful.spawn("firefox") end),

-awful.key({ cmdkey }, "m", function () awful.spawn("chromium") end),
+awful.key({ cmdkey }, "m", function () awful.spawn("chromium --enable-remote-extensions") end),

 awful.key({ cmdkey }, "y", function () awful.spawn(terminal .. " -e python") end),
 awful.key({ cmdkey }, "c", function () awful.spawn("thunderbird") end),
 awful.key({ cmdkey }, "r", function () mypromptbox[mouse.screen]:run() end),
 awful.key({ cmdkey }, "y", function () awful.spawn(terminal .. " -e python") end),
 awful.key({ cmdkey }, "c", function () awful.spawn("thunderbird") end),
 awful.key({ cmdkey }, "r", function () mypromptbox[mouse.screen]:run() end),


@@ -553,7 +558,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 .. " -title irc -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host screen -dr irc") 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),
 


@@ -601,7 +606,7 @@ awful.rules.rules = {
                      buttons = clientbuttons,
                      screen = awful.screen.preferred,
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,
                      buttons = clientbuttons,
                      screen = awful.screen.preferred,
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,

-                     floating = true
+                     floating = false

                  },
     },
 
                  },
     },
 


@@ -611,11 +616,14 @@ awful.rules.rules = {
     --DISABLED-- },
 
     { rule = { type = "dialog" },
     --DISABLED-- },
 
     { rule = { type = "dialog" },

-      properties = { placement = awful.placement.centered }},
+      properties = { floating = true,
+                     placement = awful.placement.centered
+                 }
+    },

 
     { 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" },


@@ -630,6 +638,12 @@ awful.rules.rules = {
                },
                callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
                },
                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,
     { rule = { class = "Thunderbird", instance = "Mail" },
                properties = {
                    floating = false,


@@ -658,6 +672,21 @@ awful.rules.rules = {
                    floating = false,
                },
            },
                    floating = false,
                },
            },

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

 }
 -- }}}
 
 }
 -- }}}
 


@@ -666,7 +695,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


@@ -674,6 +703,9 @@ 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.
 end)
 
 -- Add a titlebar if titlebars_enabled is set to true in the rules.


@@ -730,7 +762,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" 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