]> git.madduck.net Git - etc/awesome.git/blobdiff - .config/awesome/rc.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

font experiments
[etc/awesome.git] / .config / awesome / rc.lua
index 99b72e94cae12f2370ec537e049933d6b82b41e9..3246cb4dfc2544157f6d5142e76afe6161c87d3c 100644 (file)
@@ -7,6 +7,7 @@ require("awful.autofocus")
 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")
@@ -15,6 +16,7 @@ local lain = require("lain")
 local dkjson = require("lain.util").dkjson
 local math = require("math")
 local freedesktop = require("freedesktop")
+local luatz = require("luatz")
 -- }}}
 
 -- {{{ Error handling
@@ -43,8 +45,12 @@ end
 -- }}}
 
 -- {{{ 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")
+beautiful.font = 'Sans 10'
 
 -- This is used later as the default terminal and editor to run.
 terminal = "x-terminal-emulator"
@@ -198,9 +204,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 %Z", 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, 1, spacer)
+        table.insert(clocks, 1, widget)
+    end
+end
 
 -- Create a wibox for each screen and add it
 mywibox = {}
@@ -288,6 +308,8 @@ elseif screen.count() == 3 then -- main screen is still #1 in the middle
 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
@@ -336,17 +358,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)
 -- }}}