fix file locations

7 files changed, 22 insertions, 36 deletions

diff --git a/.config/awesome/config.lua b/.config/awesome/config.lua
index 3736ebf..2ed3392 100644
--- a/.config/awesome/config.lua
+++ b/.config/awesome/config.lua
@@ -16,10 +16,7 @@ menu_position 	= "bottom"
 tag_count		= 4
 tag_icon 		= "◊"
 tag_icon_active = "◆"
-menu_icon 		= true
-tasks_icon_only	= true
 clock_format 	= " %a %m/%d %H:%M " -- http://linux.die.net/man/3/strftime
-sloppy_focus 	= false -- switch to client on mouse over
 
 -- █▓▒░ preffered apps
 terminal 		= "urxvtc"
@@ -48,7 +45,6 @@ torrent 		= "transmission-gtk"
 calc 			= "galculator"
 pdf 			= "evince"
 imageviewer 	= "viewnior"
-locker 			= "cb-lock"
 exiter 			= "cb-exit"
 passmanager 	= "keepassx"
 runcmd 			= "gmrun"
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 132d702..195c90d 100755
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -138,10 +138,10 @@ awesomemenu = {
 gfx_settings = {
 	{"view","bash "..home.."/code/bash/gfx-status.sh"},
 	{"░░▒▒▓▓████▓▓▒▒░░"},
-	{"switch to ati","bash "..home.."/code/bash/gfx-radeon.sh"},
-	{"switch to intel","bash "..home.."/code/bash/gfx-intel.sh"},
-	{"power off unused","bash "..home.."/code/bash/gfx-off.sh"},
-	{"power on unused","bash "..home.."/code/bash/gfx-on.sh"},
+	{"switch to ati","bash "..home.."/code/sys/gfx-radeon.sh"},
+	{"switch to intel","bash "..home.."/code/sys/gfx-intel.sh"},
+	{"power off unused","bash "..home.."/code/sys/gfx-off.sh"},
+	{"power on unused","bash "..home.."/code/sys/gfx-on.sh"},
 }
 prefs = {
 	{"awesome", awesomemenu, beautiful.awesome_icon},
@@ -215,29 +215,20 @@ applications = {
 	{"accessories", accessories},
 }
 fun_scripts = {
-	{"blocks", term_exec.."bash "..home.."/fun/blocks"},
-	{"colors", term_exec.."bash "..home.."/fun/colors"},
-	{"colorscheme", term_exec.."bash "..home.."/fun/colorscheme"},
-	{"dna", term_exec.."bash "..home.."/fun/dna"},
-	{"dna1", term_exec.."bash "..home.."/fun/dna1"},
-	{"faces", term_exec.."bash "..home.."/fun/faces"},
-	{"ghosts", term_exec.."bash "..home.."/fun/ghosts"},
-	{"hax0r", term_exec.."lua "..home.."/fun/2spooky.lua"},
-	{"invaders", term_exec.."bash "..home.."/fun/invaders"},
-	{"lines", term_exec.."bash "..home.."/fun/lines"},
+	{"colors", term_exec.."bash "..home.."/code/fun/colors"},
+	{"colorscheme", term_exec.."bash "..home.."/code/fun/colorscheme"},
+	{"dna", term_exec.."bash "..home.."/code/fun/dna"},
+	{"ghosts", term_exec.."bash "..home.."/code/fun/ghosts"},
+	{"hax0r", term_exec.."lua "..home.."/code/fun/2spooky.lua"},
+	{"invaders", term_exec.."bash "..home.."/code/fun/invaders"},
 	{"matrix", term_exec.."cmatrix"},
-	{"pacman", term_exec.."bash "..home.."/fun/pacman"},
-	{"pipes", term_exec.."bash "..home.."/fun/pipes"},
-	{"pipesx", term_exec.."bash "..home.."/fun/pipesx"},
-	{"rain", term_exec.."bash "..home.."/fun/rain"},
-	{"rallyx", term_exec.."bash "..home.."/fun/rallyx"},
-	{"rectangles", term_exec.."bash "..home.."/fun/rectangles"},
-	{"screenfetch", term_exec.."bash "..home.."/fun/screenfetch"},
-	{"skull", term_exec.."bash "..home.."/fun/skull"},
-	{"slendy", term_exec.."bash "..home.."/fun/slendy"},
-	{"tanks", term_exec.."bash "..home.."/fun/tanks"},
-	{"tux", term_exec.."bash "..home.."/fun/tux"},
-	{"xrally", term_exec.."bash "..home.."/fun/xrally"},
+	{"pacman", term_exec.."bash "..home.."/code/fun/pacman"},
+	{"pipes", term_exec.."bash "..home.."/code/fun/pipes"},
+	{"pipesx", term_exec.."bash "..home.."/code/fun/pipesx"},
+	{"rain", term_exec.."bash "..home.."/code/fun/rain"},
+	{"screenfetch", term_exec.."bash "..home.."/code/fun/screenfetch"},
+	{"skull", term_exec.."bash "..home.."/code/fun/skull"},
+	{"slendy", term_exec.."bash "..home.."/code/fun/slendy"},
 }
 climenu = {
 	{"$ terminal", terminal},
@@ -268,7 +259,6 @@ mymainmenu = awful.menu({
 		{"preferences", prefs},
 		{"system", systemmenu},
 		{"░░▒▒▓▓███▓▓▒▒░░"},
-		-- {"lock screen", locker},
 		{"exit menu", exiter}
 	}, 
 	width = 250
diff --git a/code/sys/gfx-intel.sh b/code/sys/gfx-intel.sh
index c68b0c5..804de12 100755
--- a/code/sys/gfx-intel.sh
+++ b/code/sys/gfx-intel.sh
@@ -3,7 +3,7 @@
 integrated=$(echo IGD | sudo tee /sys/kernel/debug/vgaswitcheroo/switch)
 
 notify-send -t 5000 \
--i "/home/xero/.config/awesome/greyhash/gfx.png" \
+-i "/home/xero/.config/awesome/themes/ghost/gfx.png" \
 '   gfx status 
 ░░▒▒▓▓▓████▓▓▓▒▒░░' \
 " intel powered on"
\ No newline at end of file
diff --git a/code/sys/gfx-off.sh b/code/sys/gfx-off.sh
index 31f3eb9..aeb6daf 100755
--- a/code/sys/gfx-off.sh
+++ b/code/sys/gfx-off.sh
@@ -3,7 +3,7 @@
 integrated=$(echo OFF  | sudo tee /sys/kernel/debug/vgaswitcheroo/switch)
 
 notify-send -t 5000 \
--i "/home/xero/.config/awesome/greyhash/gfx.png" \
+-i "/home/xero/.config/awesome/themes/ghost/gfx.png" \
 '   gfx status 
 ░░▒▒▓▓▓████▓▓▓▒▒░░' \
 "unused powered off"
\ No newline at end of file
diff --git a/code/sys/gfx-on.sh b/code/sys/gfx-on.sh
index 44accdf..57d08d4 100755
--- a/code/sys/gfx-on.sh
+++ b/code/sys/gfx-on.sh
@@ -3,7 +3,7 @@
 integrated=$(echo ON  | sudo tee /sys/kernel/debug/vgaswitcheroo/switch)
 
 notify-send -t 5000 \
--i "/home/xero/.config/awesome/greyhash/gfx.png" \
+-i "/home/xero/.config/awesome/themes/ghost/gfx.png" \
 '   gfx status 
 ░░▒▒▓▓▓████▓▓▓▒▒░░' \
 " both powered on"
\ No newline at end of file
diff --git a/code/sys/gfx-radeon.sh b/code/sys/gfx-radeon.sh
index 070d161..a0db665 100755
--- a/code/sys/gfx-radeon.sh
+++ b/code/sys/gfx-radeon.sh
@@ -3,7 +3,7 @@
 integrated=$(echo DIS | sudo tee /sys/kernel/debug/vgaswitcheroo/switch)
 
 notify-send -t 5000 \
--i "/home/xero/.config/awesome/greyhash/gfx.png" \
+-i "/home/xero/.config/awesome/themes/ghost/gfx.png" \
 '   gfx status 
 ░░▒▒▓▓▓████▓▓▓▒▒░░' \
 "radeon powered on"
\ No newline at end of file
diff --git a/code/sys/gfx-status.sh b/code/sys/gfx-status.sh
index d8e621a..93d564a 100755
--- a/code/sys/gfx-status.sh
+++ b/code/sys/gfx-status.sh
@@ -32,7 +32,7 @@ discrete_condition="off"
 fi
 
 notify-send -t 5000 \
--i "/home/xero/.config/awesome/greyhash/gfx.png" \
+-i "/home/xero/.config/awesome/themes/ghost/gfx.png" \
 '  gfx status 
 ░░▒▒▓▓███▓▓▒▒░░' \
 " intel  = $integrated_condition