Merge branch 'master' of sc:awesome

.gitignore

@@ -2,3 +2,4 @@ wp
 wallpaper
 walls
 *.swp
+localconf.lua

localconf.lua.template

@@ -0,0 +1,5 @@
+terminal = "urxvtc -e tmux"
+editor_cmd = "urxvtc -e vim"
+modkey = "Mod4"
+hyper = "Mod3"
+rule_screen=1

rc.lua

@@ -1,8 +1,3 @@
-terminal = "urxvtc -e tmux"
-editor_cmd = "urxvtc -e vim"
-modkey = "Mod4"
-hyper = "Mod3"
-rule_screen=1
 
 -- Standard awesome library
 require("awful")
@@ -19,6 +14,8 @@ require("aweswt")
 MY_PATH  = os.getenv("HOME") .. "/.config/awesome/"
 WALLPATH = MY_PATH .. "walls/"
 
+dofile (MY_PATH .. "localconf.lua")
+
 -- Themes define colours, icons, and wallpapers
 beautiful.init("/home/crater2150/.config/awesome/zenburn/theme.lua")
 

rules.lua

@@ -41,6 +41,10 @@ awful.rules.rules = {
       properties = { tag = tags[rule_screen][4] } },
     { rule = { instance = "Gmutt" },
       properties = { tag = tags[rule_screen][4] } },
+    { rule = { instance = "Gcanto" },
+      properties = { tag = tags[rule_screen][5] } },
+    { rule = { instance = "Gncmpcpp" },
+      properties = { tag = tags[rule_screen][6] } },
     { rule = { class = "Gmpc" },
       properties = { tag = tags[rule_screen][6] } },
     { rule = { class = "Deluge" },