X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/25e897c6c9a9248014afad69b68e0d17f14a5a66..c16f1d69f7988c23b5b06c43c220318aeaabe24c:/awesome/rc.lua?ds=sidebyside

diff --git a/awesome/rc.lua b/awesome/rc.lua
index b91d41c..c932e62 100644
--- 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")
@@ -6,7 +6,7 @@ require("awful.autofocus")
 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
@@ -27,35 +27,27 @@ 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"
 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)
-    end
-end
-
 -- 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