Merge branch 'master' into vim-clean

[dotfiles.git] / awesome / rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index b716457bd4dc94a0930d0e67dee74ca13d50ff99..1a49ab741c053ea0aba17e8eb530c0e795508ddf 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -3,15 +3,11 @@ gears = require("gears")
 awful = require("awful")
 awful.rules = require("awful.rules")
 require("awful.autofocus")
--- Widget and layout library
-wibox = require("wibox")
 -- Theme handling library
 beautiful = require("beautiful")
 -- Notification library
 naughty = require("naughty")
 menubar = require("menubar")
--- Pulseaudio widget
---local APW = require("apw/widget")
 
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
@@ -40,20 +36,13 @@ end
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
-beautiful.init("/usr/share/awesome/themes/default/theme.lua")
+beautiful.init(awful.util.getdir("config").."/themes/mlp/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
-terminal = "konsole"
+terminal = "urxvtc"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
-
 -- Tags
 require("tags")
 -- }}}
@@ -78,6 +67,9 @@ require("bindings")
 -- Rules
 require("rules")
 
+-- conky
+require("conky")
+
 -- {{{ Signals
 -- Signal function to execute when a new client appears.
 client.connect_signal("manage", function (c, startup)
@@ -106,6 +98,8 @@ client.connect_signal("focus", function(c) c.border_color = beautiful.border_foc
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}
 
--- {{{ Autostart applications
+-- Set keys
+root.keys(globalkeys)
+
+-- Autostart applications
 require("autostart")
--- }}}