way too many changes for one commit

autostart

@@ -1,39 +1,44 @@
 #!/usr/bin/env bash
+exec 2>&1 > >(tee -i /tmp/hlwm-autostart.log)
 
-CFGDIR=$HOME/.config/herbstluftwm
+PIDS_FILE=/tmp/hlwm-autostart-pids
 
-# kill old instances, perhaps I should do this with pids?
-pkill dzen2
-pkill lemonbar
-pkill stalonetray
-pkill conky
-pkill urxvtd
-pkill udiskie
+hc() {
+    herbstclient "$@"
+}
 
-herbstclient emit_hook reload
+store_pid() {
+    echo $! >> $PIDS_FILE
+}
 
-${CFGDIR}/bindings.sh
-${CFGDIR}/rules.sh
-${CFGDIR}/styling.sh
+OLD_PIDS=$(cat $PIDS_FILE)
+rm $PIDS_FILE
 
-herbstclient set tree_style '╾│ ├└╼─┐'
-herbstclient unlock
-herbstclient detect_monitors
+kill $OLD_PIDS
+
+hc emit_hook reload
+
+~/.config/herbstluftwm/bindings.sh
+~/.config/herbstluftwm/rules.sh
+~/.config/herbstluftwm/styling.sh
+
+hc set tree_style '╾│ ├└╼─┐'
+hc unlock
+hc detect_monitors
 
 panel_height=20
 statusbar_height=20
 
-for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do
+for monitor in $(hc list_monitors | cut -d: -f1) ; do
     # start it on each monitor
-    herbstclient pad $monitor $panel_height 0 $statusbar_height 0
-    ${CFGDIR}/panel.sh $monitor &
-    ${CFGDIR}/statusbar.sh $monitor &
+    hc pad $monitor $panel_height 0 $statusbar_height 0
+    ~/.config/herbstluftwm/panel.sh $monitor & store_pid
+    ~/.config/herbstluftwm/statusbar.sh $monitor & store_pid
 done
 
-${CFGDIR}/tray.sh &
+~/.config/herbstluftwm/tray.sh & store_pid
+udiskie --tray & store_pid
 
-urxvtd &
-udiskie --tray &
 systemctl --user restart sxhkd
 systemctl --user restart xautolock