Merge branch 'master' into vim-clean

[dotfiles.git] / awesome / rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index bd9b8b342b33982d3eeff7b287e152d7efe58174..1a49ab741c053ea0aba17e8eb530c0e795508ddf 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -8,8 +8,6 @@ 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
@@ -38,20 +36,13 @@ end
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
-beautiful.init(awful.util.getdir("config").."/themes/shattered/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 = "urxvt"
+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")
 -- }}}
@@ -110,6 +101,5 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n
 -- Set keys
 root.keys(globalkeys)
 
--- {{{ Autostart applications
+-- Autostart applications
 require("autostart")
--- }}}