awesome: update pomodoro submodule

[dotfiles.git] / awesome / rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index b91d41cd33e3a1bf444595c2a48d7ca30faa804b..c4f3d6294cae5e57e366f0bd55d8397d8512bfe5 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -1,4 +1,4 @@
--- Standard awesome library {{{1
+-- Awesome libraries {{{1
 gears = require("gears")
 awful = require("awful")
 awful.rules = require("awful.rules")
@@ -7,6 +7,7 @@ beautiful = require("beautiful")
 naughty = require("naughty")
 menubar = require("menubar")
 lain = require("lain")
+require("awful.remote")
 
 -- Error handling {{{1
 -- Check if awesome encountered an error during startup and fell back to
@@ -42,20 +43,28 @@ editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
 -- Wallpaper {{{1
-if beautiful.wallpaper then
-    for s = 1, screen.count() do
-        gears.wallpaper.maximized(beautiful.wallpaper, s, true)
+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
+        gears.wallpaper.maximized(wallpaper, s, true)
     end
 end
 
+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+screen.connect_signal("property::geometry", set_wallpaper)
+
 -- Require files {{{1
+require("bindings")
 require("tags")
 require("menu")
 require("topbar")
-require("bindings")
 require("rules")
-require("conky")
-require("autostart")
+-- require("conky")
 require("signals")
 
 -- Set keys