X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/149d3b5992793ad59d7785efa6facc8e374514a3..800d8089ce276ae1b2a3f9875a370b7e00a763db:/awesome/rc.lua?ds=sidebyside

diff --git a/awesome/rc.lua b/awesome/rc.lua
index c4f3d62..74688d7 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -6,7 +6,6 @@ require("awful.autofocus")
 beautiful = require("beautiful")
 naughty = require("naughty")
 menubar = require("menubar")
-lain = require("lain")
 require("awful.remote")
 
 -- Error handling {{{1
@@ -28,36 +27,28 @@ do
 
         naughty.notify({ preset = naughty.config.presets.critical,
                          title = "Oops, an error happened!",
-                         text = err })
+                         text = tostring(err) })
         in_error = false
     end)
 end
 
 -- Variable definitions {{{1
--- Themes define colours, icons, and wallpapers
-beautiful.init(awful.util.getdir("config").."/themes/mlp/theme.lua")
+-- Themes define colours, icons, font and wallpapers.
+beautiful.init(gears.filesystem.get_dir("config").."/themes/mlp/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
-terminal = "urxvtc"
+terminal = os.getenv("TERMINAL") or "xterm"
+terminal_class = (function()
+    local map = { urxvt  = "URxvt"
+                , urxvtc = "URxvt"
+                , xterm  = "XTerm"
+                }
+    return map[terminal] or terminal
+end)()
+
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
--- Wallpaper {{{1
-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")