vim: add choice snippet for sh

[dotfiles.git] / awesome / rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index d7d3a4321c2563f96b756d6f380abc7d978052a5..9a113241b474b5b3b69779f730258741d4ed0171 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -28,13 +28,13 @@ 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
+-- Themes define colours, icons, font and wallpapers.
 beautiful.init(awful.util.getdir("config").."/themes/mlp/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
@@ -42,21 +42,13 @@ 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("rules")
-require("conky")
-require("autostart")
+-- require("conky")
 require("signals")
 
 -- Set keys