6 files changed, 4 insertions, 28 deletions
diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index f122503..c445ebf 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -33,11 +33,11 @@ hc keybind $Mod-w	spawn interrobang
 hc keybind $Mod-r	spawn interrobang 
 
 # toggle touchpad
-hc keybind $Mod-m	spawn bash /home/xero/code/sys/toggle-touchpad
+hc keybind $Mod-m	spawn bash $HOME/bin/toggle-touchpad
 
 # dynamic window gap
-hc keybind $Mod-9	spawn bash /home/xero/code/sys/herbstluftwm-remove-gap
-hc keybind $Mod-0	spawn bash /home/xero/code/sys/herbstluftwm-add-gap
+hc keybind $Mod-9	spawn bash $HOME/bin/herbstluftwm-remove-gap
+hc keybind $Mod-0	spawn bash $HOME/bin/herbstluftwm-add-gap
 
 # generic actions
 hc keybind $Mod-Shift-q quit
diff --git a/herbstluftwm/.config/herbstluftwm/conkypanel b/herbstluftwm/.config/herbstluftwm/conkypanel
deleted file mode 100755
index 2893da7..0000000
--- a/herbstluftwm/.config/herbstluftwm/conkypanel
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
-monitor=${1:-0}
-geometry=( $(herbstclient monitor_rect "$monitor") )
-if [ -z "$geometry" ] ;then
-    echo "Invalid monitor $monitor"
-    exit 1
-fi
-# geometry has the format W H X Y
-x=${geometry[0]}
-y=${geometry[1]}
-panel_width=${geometry[2]}
-panel_height=16
-#font="-*-fixed-medium-*-*-*-12-*-*-*-*-*-*-*"
-font="-Gohu-GohuFont-Medium-R-Normal--11-80-100-100-C-60-ISO10646-1"
-bgcolor=$(hc get frame_border_normal_color)
-fgcolor='#efefef'
-
-conky | dzen2 -w $panel_width -x $x -y $y -fn "$font" -h $panel_height \
-    -e 'button3=;button4=exec:herbstclient use_index -1;button5=exec:herbstclient use_index +1' \
-    -ta l -bg "$bgcolor" -fg "$fgcolor" & 
-
-sleep 2
-stalonetray
diff --git a/herbstluftwm/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/panel.sh
index 34b7bb9..26c6055 100755
--- a/herbstluftwm/.config/herbstluftwm/panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel.sh
@@ -75,7 +75,7 @@ hc pad $monitor $panel_height
     do
         # "date" output is checked once a second, but an event is only
         # generated if the output changed compared to the previous run.
-        date +$'date\t ^ca(1,~/code/sys/calendar)^fg(#d9d9d9)^i(/usr/share/icons/stlarch_icons/clock1.xbm) ^fg(#efefef)%H:%M^fg(#bcbcbc) %Y-%m-^fg(#efefef)%d^ca()'
+        date +$'date\t ^ca(1,~/bin/calendar)^fg(#d9d9d9)^i(/usr/share/icons/stlarch_icons/clock1.xbm) ^fg(#efefef)%H:%M^fg(#bcbcbc) %Y-%m-^fg(#efefef)%d^ca()'
         sleep 1 || break
     done > >(uniq_linebuffered) &
     childpid=$!
diff --git a/herbstluftwm/code/sys/calendar b/herbstluftwm/bin/calendar
index 28199ae..28199ae 100755
--- a/herbstluftwm/code/sys/calendar
+++ b/herbstluftwm/bin/calendar
diff --git a/herbstluftwm/code/sys/herbstluftwm-add-gap b/herbstluftwm/bin/herbstluftwm-add-gap
index cc5492c..cc5492c 100755
--- a/herbstluftwm/code/sys/herbstluftwm-add-gap
+++ b/herbstluftwm/bin/herbstluftwm-add-gap
diff --git a/herbstluftwm/code/sys/herbstluftwm-remove-gap b/herbstluftwm/bin/herbstluftwm-remove-gap
index b30b3eb..b30b3eb 100755
--- a/herbstluftwm/code/sys/herbstluftwm-remove-gap
+++ b/herbstluftwm/bin/herbstluftwm-remove-gap