9 files changed, 91 insertions, 90 deletions

diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 7a80b1c..78a81b4 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -1,17 +1,16 @@
 #!/usr/bin/env bash
 
-# this is a simple config for herbstluftwm
-
-# The current directory
-dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
 # Herbstclient shortcut
 hc() {
     herbstclient "$@"
 }
+export -f hc
+
+# The current directory
+export HLWM_CONF_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 #Include the theming script
-source "$dir/theme"
+source "$HLWM_CONF_DIR/themes/current"
 
 #Detect monitors
 hc set auto_detect_monitors 1
@@ -26,17 +25,16 @@ dmenu_opts="-h $panel_h -w $panel_w -x $window_p -y $window_p -p Run: -nb $color
 tag_names=()
 tag_keys=({1..9} 0)
 for key in ${tag_keys[@]}; do
-        if [ $key -eq 0 ]; then key=10; fi
-        key=$(echo "$key - 1" | bc)
-        echo $key
-        name=$(echo "obase=2;$key" | bc | awk '{ printf "%04d", $0 }')
-        tag_names+=($name)
+    if [ $key -eq 0 ]; then key=10; fi
+    key=$(echo "$key - 1" | bc)
+    name=$(echo "obase=2;$key" | bc | awk '{ printf "%04d", $0 }')
+    tag_names+=($name)
 done;
 
 # Source hlwm-config-files
-source "$dir/hlwm-keybindings"
-source "$dir/hlwm-theming"
-source "$dir/hlwm-rules"
+source "$HLWM_CONF_DIR/hlwm-keybindings"
+source "$HLWM_CONF_DIR/hlwm-theming"
+source "$HLWM_CONF_DIR/hlwm-rules"
 
 # Unlock, just to be sure
 hc unlock
@@ -44,29 +42,20 @@ hc unlock
 herbstclient set tree_style '╾│ ├└╼─┐'
 
 # Start panel in all monitors
-start_panel() {
-        for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do
-                "$1" $monitor&
-        done
-}
-
-# Find the panel
-panel=$dir/panel.sh
+panel=$HLWM_CONF_DIR/start_panel.sh
 [ -x "$panel" ] || panel=/etc/xdg/herbstluftwm/panel.sh
-if pgrep panel.sh >> /dev/null
-then
-        kill $(pgrep panel.sh)
-        start_panel $panel
-else
-        start_panel $panel
-fi
+for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do
+    $panel $monitor&
+done
 
 pulseaudio --start
 
-$dir/start.sh "xautolock -time 5 -locker $dir/lock.sh"
-$dir/start.sh "feh --bg-fill $wallpaper"
-$dir/start.sh "compton --config $HOME/.compton"
-$dir/start.sh "xrdb -load $HOME/.Xresources"
-$dir/start.sh "xset +fp /usr/share/fonts/local"
-$dir/start.sh "xset fp rehash"
-#$dir/start.sh "$dir/notify.sh $dir/popup.sh"
+$HLWM_CONF_DIR/start.sh "xautolock -time 5 -locker $HLWM_CONF_DIR/lock.sh"
+$HLWM_CONF_DIR/start.sh "feh --bg-fill $wallpaper"
+$HLWM_CONF_DIR/start.sh "compton --config $HOME/.compton"
+$HLWM_CONF_DIR/start.sh "xrdb -load $HOME/.Xresources"
+$HLWM_CONF_DIR/start.sh "xset +fp /usr/share/fonts/local"
+$HLWM_CONF_DIR/start.sh "xset fp rehash"
+#$HLWM_CONF_DIR/start.sh "$HLWM_CONF_DIR/notify.sh $HLWM_CONF_DIR/popup.sh"
+
+# vim: set ts=4 sw=4 tw=0 et :
diff --git a/herbstluftwm/.config/herbstluftwm/dependencylist b/herbstluftwm/.config/herbstluftwm/dependencylist
index e62c3af..34c9bf9 100644
--- a/herbstluftwm/.config/herbstluftwm/dependencylist
+++ b/herbstluftwm/.config/herbstluftwm/dependencylist
@@ -4,12 +4,12 @@ compton
 dmenu2
 feh
 i3lock
-lemonbar-git
+lemonbar-xft-git
 playerctl
 pulseaudio
 pulseaudio-alsa
 scrot
 sed
-stlarch_font
+ttf-font-awesome
 wireless_tools
 xautolock
diff --git a/herbstluftwm/.config/herbstluftwm/panel_handler.sh b/herbstluftwm/.config/herbstluftwm/panel_handler.sh
new file mode 100755
index 0000000..6bff693
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/panel_handler.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+#Handle clickable areas
+while read line; do
+    IFS=',' read -a c <<< $(echo $line)
+    case "${c[0]}" in
+        tag)
+            herbstclient use "${c[1]}"
+            echo "herbstclient use \"${c[1]}\""
+            ;;
+        *)
+            echo "${c[0]}: not valid command"
+            ;;
+    esac
+done
+
+# vim: set ts=4 sw=4 tw=0 et :
diff --git a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
index a433e3a..ad45d75 100644..100755
--- a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
-icon_font="-*-stlarch-medium-*-*-*-10-*-*-*-*-*-*-*"
+#!/usr/bin/env bash
+icon_font="FontAwesome-10"
 battery_icon=("\ue113" "\ue114" "\ue115" "\ue116" "\ue042")
-network_icon=("\ue0f1" "\ue0f2" "\ue0f3" "%{T2}\ue0af%{T-}")
+network_icon=("\ue0f1" "\ue0f2" "\ue0f3" "\ue0af")
 music_icon="\ue05c"
 
 music()
@@ -43,7 +43,7 @@ volume()
         if [ -z $vol ] ; then
             echo -e "volume\toff"
         else
-            echo -e "volume\t%{F$acolor_fg}\ue05d $vol%%%{F-}"
+            echo -e "volume\t%{F$acolor_fg}\ue05d $vol%%{F-}"
         fi
     else
         echo -e "volume\toff"
diff --git a/herbstluftwm/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/populate_panel.sh
index 70e8154..07ecafd 100755
--- a/herbstluftwm/.config/herbstluftwm/panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/populate_panel.sh
@@ -1,30 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-dir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
-
-hc() {
-    "${herbstclient_command[@]:-herbstclient}" "$@"
-}
-
-source "$dir/theme"
-source "$dir/panel_indicators.sh"
-
-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=$(echo "${geometry[0]} + $window_p" | bc)
-y=$(echo "${geometry[1]} + $window_p" | bc)
-
-panel_width=$(echo "${geometry[2]} - (2 * $window_p)" | bc)
-bar_opts="-g ${panel_width}x${panel_h}+${x}+${y} -f $font -f $icon_font -u 2 -B $acolor_bg -F $acolor_fg"
-
-hc pad $monitor $(echo "$panel_h + $window_p" | bc)
+source "$HLWM_CONF_DIR/themes/current"
+source "$HLWM_CONF_DIR/panel_indicators.sh"
 
 if awk -Wv 2>/dev/null | head -1 | grep -q '^mawk'; then
     # mawk needs "-W interactive" to line-buffer stdout correctly
@@ -99,7 +76,7 @@ fi
         echo -n "$separator%{F-}%{B-} "
         echo -n "${windowtitle//^/^^}"
 
-        # Right part of panel
+       # Right part of panel
         right="$music$volume$net$battery$date "
         echo -n "%{r}$right"
 
@@ -155,22 +132,6 @@ fi
         esac
     done