Merge remote-tracking branch 'refs/remotes/origin/master'

[dotfiles.git] / awesome / rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index b91d41cd33e3a1bf444595c2a48d7ca30faa804b..af38777cdad3ec67ad7163386aecb173ef443a48 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
@@ -49,12 +50,12 @@ if beautiful.wallpaper then
 end
 
 -- Require files {{{1
+require("bindings")
 require("tags")
 require("menu")
 require("topbar")
-require("bindings")
 require("rules")
-require("conky")
+-- require("conky")
 require("autostart")
 require("signals")