X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/381e40aaea49fdd3db6161e94741f9916631d938..6a3bcf63009c047037855888a8dc66ae3d5a542d:/.config/awesome/rc.lua?ds=sidebyside

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index cdec818..3246cb4 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -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")
@@ -44,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"
@@ -201,22 +206,19 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 local spacer = wibox.widget.textbox()
 spacer:set_text(' │ ')
 -- Create a textclock widget
-clocks = { 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"
 }
-
-now = luatz.time_in(nil)
+local now = luatz.time_in(nil)
 for c, tz in sorted_pairs(ZONES) do
-    t = luatz.time_in(tz)
-    print (c)
-    print (os.difftime(t, now))
+    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)
+        table.insert(clocks, 1, spacer)
+        table.insert(clocks, 1, widget)
     end
 end
 
@@ -306,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