add gpg-agent to xprofile

[dotfiles.git] / awesome / rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 0de85cc1bd539c6563599ba2e35710b9fc565a29..bd9b8b342b33982d3eeff7b287e152d7efe58174 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -38,10 +38,10 @@ 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/shattered/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
-terminal = "konsole"
+terminal = "urxvt"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
@@ -76,6 +76,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)
@@ -104,6 +107,9 @@ 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)
 -- }}}
 
+-- Set keys
+root.keys(globalkeys)
+
 -- {{{ Autostart applications
 require("autostart")
 -- }}}