Merge branch 'hlwm_refactoring'

12 files changed, 325 insertions, 287 deletions

diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 683fbf1..78a81b4 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -1,14 +1,16 @@
-#!/bin/bash
-
-# this is a simple config for herbstluftwm
+#!/usr/bin/env bash
 
+# Herbstclient shortcut
 hc() {
     herbstclient "$@"
 }
+export -f hc
+
+# The current directory
+export HLWM_CONF_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 #Include the theming script
-dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source "$dir/theme.sh"
+source "$HLWM_CONF_DIR/themes/current"
 
 #Detect monitors
 hc set auto_detect_monitors 1
@@ -19,175 +21,41 @@ monitor_w=($(hc list_monitors | sed 's/^[0-9]: \([0-9]*\)x.*$/\1/'))
 panel_w=$(echo "$monitor_w - (2 * $window_p)" | bc)
 dmenu_opts="-h $panel_h -w $panel_w -x $window_p -y $window_p -p Run: -nb $color_bg -nf $color_fg -sb $color_accent -sf $color_bg"
 
-# remove all existing keybindings
-hc keyunbind --all
-
-# keybindings
-Mod=Mod4   # Use the super key as the main modifier
-
-hc keybind $Mod-Shift-q quit
-hc keybind $Mod-Shift-r reload
-hc keybind $Mod-Shift-c close
-hc keybind $Mod-Return spawn xterm
-hc keybind $Mod-grave spawn dmenu_run $dmenu_opts
-hc keybind XF86AudioLowerVolume spawn amixer set Master 1%-
-hc keybind XF86AudioRaiseVolume spawn amixer set Master 1%+
-
-# basic movement
-# focusing clients
-#hc keybind $Mod-Left  focus left
-#hc keybind $Mod-Down  focus down
-#hc keybind $Mod-Up    focus up
-#hc keybind $Mod-Right focus right
-hc keybind $Mod-h     focus left
-hc keybind $Mod-j     focus down
-hc keybind $Mod-k     focus up
-hc keybind $Mod-l     focus right
-
-# moving clients
-#hc keybind $Mod-Shift-Left  shift left
-#hc keybind $Mod-Shift-Down  shift down
-#hc keybind $Mod-Shift-Up    shift up
-#hc keybind $Mod-Shift-Right shift right
-hc keybind $Mod-Shift-h     shift left
-hc keybind $Mod-Shift-j     shift down
-hc keybind $Mod-Shift-k     shift up
-hc keybind $Mod-Shift-l     shift right
-
-# splitting frames
-# create an empty frame at the specified direction
-hc keybind $Mod-u       split   bottom  0.5
-hc keybind $Mod-o       split   right   0.5
-# let the current frame explode into subframes
-hc keybind $Mod-Control-space split explode
-
-# resizing frames
-resizestep=0.05
-hc keybind $Mod-Control-h       resize left +$resizestep
-hc keybind $Mod-Control-j       resize down +$resizestep
-hc keybind $Mod-Control-k       resize up +$resizestep
-hc keybind $Mod-Control-l       resize right +$resizestep
-#hc keybind $Mod-Control-Left    resize left +$resizestep
-#hc keybind $Mod-Control-Down    resize down +$resizestep
-#hc keybind $Mod-Control-Up      resize up +$resizestep
-#hc keybind $Mod-Control-Right   resize right +$resizestep
-
-# tags
-tag_names=( I II III IV V VI VII VIII IX X )
-tag_keys=( {1..9} 0 )
-
-# Selecting workspaces
-#hc keybind Alt-Control-Left    use_index -1
-#hc keybind Alt-Control-Right   use_index +1
-hc keybind Alt-Control-h        use_index -1
-hc keybind Alt-Control-l        use_index +1
-hc rename default "${tag_names[0]}" || true
-for i in ${!tag_names[@]} ; do
-    hc add "${tag_names[$i]}"
-    key="${tag_keys[$i]}"
-    if ! [ -z "$key" ] ; then
-        hc keybind "$Mod-$key" use_index "$i"
-        hc keybind "$Mod-Shift-$key" move_index "$i"
-    fi
-done
-
-# cycle through tags
-hc keybind $Mod-period use_index +1 --skip-visible
-hc keybind $Mod-comma  use_index -1 --skip-visible
+# Tags
+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)
+    name=$(echo "obase=2;$key" | bc | awk '{ printf "%04d", $0 }')
+    tag_names+=($name)
+done;
 
-# layouting
-hc keybind $Mod-r remove
-hc keybind $Mod-space cycle_layout 1
-hc keybind $Mod-s floating toggle
-hc keybind $Mod-f fullscreen toggle
-hc keybind $Mod-p pseudotile toggle
+# Source hlwm-config-files
+source "$HLWM_CONF_DIR/hlwm-keybindings"
+source "$HLWM_CONF_DIR/hlwm-theming"
+source "$HLWM_CONF_DIR/hlwm-rules"
 
-# mouse
-hc mouseunbind --all
-hc mousebind $Mod-Button1 move
-hc mousebind $Mod-Button2 zoom
-hc mousebind $Mod-Button3 resize
-
-# focus
-hc keybind $Mod-BackSpace   cycle_monitor
-hc keybind $Mod-Tab         cycle_all +1
-hc keybind $Mod-Shift-Tab   cycle_all -1
-hc keybind $Mod-c cycle
-hc keybind $Mod-i jumpto urgent
-hc set focus_follows_mouse 1
-
-# theme
-hc attr theme.tiling.reset 1
-hc attr theme.floating.reset 1
-hc set frame_border_width 0
-hc set always_show_frame 0
-hc set frame_bg_transparent 1
-hc set frame_normal_opacity 0
-hc set frame_active_opacity 0
-hc set frame_transparent_width 0
-hc set frame_gap 0
-
-hc attr theme.active.color $color_accent
-hc attr theme.normal.color $color_bg
-hc attr theme.urgent.color orange
-hc attr theme.inner_width 1
-hc attr theme.inner_color $color_bg
-hc attr theme.border_width 3
-hc attr theme.floating.border_width 4
-hc attr theme.floating.outer_width 1
-hc attr theme.floating.outer_color $color_bg
-hc attr theme.active.inner_color $color_bg
-hc attr theme.active.outer_color $color_bg
-hc attr theme.background_color $color_bg
-
-hc set window_gap $window_p
-hc set frame_padding 0
-hc set smart_window_surroundings 0
-hc set smart_frame_surroundings 1
-hc set mouse_recenter_gap 1
-
-# rules
-hc unrule -F
-hc rule focus=on # normally focus new clients
-
-#hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' pseudotile=on
-hc rule windowtype='_NET_WM_WINDOW_TYPE_DIALOG' focus=on
-hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' manage=off
-
-hc rule --class~'(.*[Ss]team.*)' --tag=IX --focus=off
-hc rule --class~'(.*[Hh]exchat.*)' --tag=X --focus=off
-hc rule --class~'(.*[Ss]potify.*)' --tag=X --focus=off
-hc rule --class~'(.*[Ss]kype.*)' --tag=VIII --focus=off
-
-# unlock, just to be sure
+# Unlock, just to be sure
 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
+# Start panel in all monitors
+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..84c61d7 100644
--- a/herbstluftwm/.config/herbstluftwm/dependencylist
+++ b/herbstluftwm/.config/herbstluftwm/dependencylist
@@ -4,12 +4,13 @@ compton
 dmenu2
 feh
 i3lock
-lemonbar-git
+lemonbar-xft-git
 playerctl
 pulseaudio
 pulseaudio-alsa
 scrot
 sed
-stlarch_font
+ttf-dejavu
+ttf-font-awesome
 wireless_tools
 xautolock
diff --git a/herbstluftwm/.config/herbstluftwm/hlwm-keybindings b/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
new file mode 100644
index 0000000..4a6a614
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+
+# Remove all existing keybindings
+hc keyunbind --all
+
+# Keybindings
+Mod=Mod4   # Use the super key as the main modifier
+
+hc keybind $Mod-Shift-q quit
+hc keybind $Mod-Shift-r reload
+hc keybind $Mod-Shift-c close
+hc keybind $Mod-Return spawn xterm
+hc keybind $Mod-grave spawn dmenu_run $dmenu_opts
+hc keybind XF86AudioLowerVolume spawn amixer set Master 1%-
+hc keybind XF86AudioRaiseVolume spawn amixer set Master 1%+
+
+# Basic movement
+# Focusing clients
+hc keybind $Mod-h     focus left
+hc keybind $Mod-j     focus down
+hc keybind $Mod-k     focus up
+hc keybind $Mod-l     focus right
+
+# Moving clients
+hc keybind $Mod-Shift-h     shift left
+hc keybind $Mod-Shift-j     shift down
+hc keybind $Mod-Shift-k     shift up
+hc keybind $Mod-Shift-l     shift right
+
+# Splitting frames
+# Create an empty frame at the specified direction
+hc keybind $Mod-u       split   bottom  0.5
+hc keybind $Mod-o       split   right   0.5
+# Let the current frame explode into subframes
+hc keybind $Mod-Control-space split explode
+
+# Resizing frames
+resizestep=0.05
+hc keybind $Mod-Control-h       resize left +$resizestep
+hc keybind $Mod-Control-j       resize down +$resizestep
+hc keybind $Mod-Control-k       resize up +$resizestep
+hc keybind $Mod-Control-l       resize right +$resizestep
+
+# Selecting workspaces
+hc keybind Alt-Control-h        use_index -1
+hc keybind Alt-Control-l        use_index +1
+hc rename default "${tag_names[0]}" || true
+for i in ${!tag_names[@]} ; do
+    hc add "${tag_names[$i]}"
+    key="${tag_keys[$i]}"
+    if ! [ -z "$key" ] ; then
+        hc keybind "$Mod-$key" use_index "$i"
+        hc keybind "$Mod-Shift-$key" move_index "$i"
+    fi
+done
+
+# Cycle through tags
+hc keybind $Mod-period use_index +1 --skip-visible
+hc keybind $Mod-comma  use_index -1 --skip-visible
+
+# Layouting
+hc keybind $Mod-r remove
+hc keybind $Mod-space cycle_layout 1
+hc keybind $Mod-s floating toggle
+hc keybind $Mod-f fullscreen toggle
+hc keybind $Mod-p pseudotile toggle
+
+# Mouse
+hc mouseunbind --all
+hc mousebind $Mod-Button1 move
+hc mousebind $Mod-Button2 zoom
+hc mousebind $Mod-Button3 resize
+
+# Focus
+hc keybind $Mod-BackSpace   cycle_monitor
+hc keybind $Mod-Tab         cycle_all +1
+hc keybind $Mod-Shift-Tab   cycle_all -1
+hc keybind $Mod-c cycle
+hc keybind $Mod-i jumpto urgent
+hc set focus_follows_mouse 1
diff --git a/herbstluftwm/.config/herbstluftwm/hlwm-rules b/herbstluftwm/.config/herbstluftwm/hlwm-rules
new file mode 100644
index 0000000..df4df45
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/hlwm-rules
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# Rules
+hc unrule -F
+hc rule focus=on # normally focus new clients
+
+hc rule windowtype='_NET_WM_WINDOW_TYPE_DIALOG' focus=on
+hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' manage=off
+
+hc rule --class~'(.*[Ss]team.*)' --tag=IX --focus=off
+hc rule --class~'(.*[Hh]exchat.*)' --tag=X --focus=off
+hc rule --class~'(.*[Ss]potify.*)' --tag=X --focus=off
+hc rule --class~'(.*[Ss]kype.*)' --tag=VIII --focus=off
diff --git a/herbstluftwm/.config/herbstluftwm/hlwm-theming b/herbstluftwm/.config/herbstluftwm/hlwm-theming
new file mode 100644
index 0000000..0ffd366
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/hlwm-theming
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# Theme
+hc attr theme.tiling.reset 1
+hc attr theme.floating.reset 1
+hc set frame_border_width 0
+hc set always_show_frame 0
+hc set frame_bg_transparent 1
+hc set frame_normal_opacity 0
+hc set frame_active_opacity 0
+hc set frame_transparent_width 0
+hc set frame_gap 0
+
+hc attr theme.active.color $color_accent
+hc attr theme.normal.color $color_bg
+hc attr theme.urgent.color orange
+hc attr theme.inner_width 1
+hc attr theme.inner_color $color_bg
+hc attr theme.border_width 3
+hc attr theme.floating.border_width 4
+hc attr theme.floating.outer_width 1
+hc attr theme.floating.outer_color $color_bg
+hc attr theme.active.inner_color $color_bg
+hc attr theme.active.outer_color $color_bg
+hc attr theme.background_color $color_bg
+
+hc set window_gap $window_p
+hc set frame_padding 0
+hc set smart_window_surroundings 0
+hc set smart_frame_surroundings 1
+hc set mouse_recenter_gap 1
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 e450337..5797781 100644..100755
--- a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
@@ -1,7 +1,11 @@
-#!/bin/bash
-battery_icon=("\ue113" "\ue114" "\ue115" "\ue116" "\ue042")
-network_icon=("\ue0f1" "\ue0f2" "\ue0f3" "\ue0af")
-music_icon="\ue05c"
+#!/usr/bin/env bash
+
+icon_font="FontAwesome-10"
+
+battery_icon=("\uf244" "\uf243" "\uf242" "\uf241" "\uf240" "\uf1e6")
+network_icon=("\uf1eb" "\uf109")
+music_icon="\uf001"
+volume_icon=("\uf026" "\uf027" "\uf028")
 
 music()
 {
@@ -34,16 +38,21 @@ volume()
         volumes=$(\
             amixer get Master | \
             grep "Front Right: Playback"\
-        )
+            )
         vol=$(\
             echo $volumes | \
             sed "s/.*\[\([0-9]*\)%\].*/\1/"\
-        )
+            )
         if [ -z $vol ] ; then
-            echo -e "volume\toff"
+            vol_status="off"
+        elif [ $vol -eq 0 ]; then
+            vol_status="%{F$acolor_fg}${volume_icon[0]} $vol%%{F-}"
+        elif [ $vol -lt 33 ]; then
+            vol_status="%{F$acolor_fg}${volume_icon[1]} $vol%%{F-}"
         else
-            echo -e "volume\t%{F$acolor_fg}\ue05d $vol%%%{F-}"
+            vol_status="%{F$acolor_fg}${volume_icon[2]} $vol%%{F-}"
         fi
+        echo -e "volume\t$vol_status"
     else
         echo -e "volume\toff"
     fi
@@ -66,7 +75,7 @@ network()
     if [ $int == $wifi ] ; then
         iwconfig=$(iwconfig $int)
         ssid=$(
-            echo $iwconfig | \
+        echo $iwconfig | \
             sed "s/.*ESSID:\(\".*\"\).*/\1/" | \
             sed "s/.*\(off\/any\).*/\"\1\"/" | \
             sed "s/.*\"\(.*\)\".*/\1/"
@@ -79,49 +88,53 @@ network()
         )
 
         if [ $ssid == "off/any" ] ; then
-            echo -e "net\toff"
-        elif [ $quality -lt 33 ] ; then
-            echo -e "net\t${network_icon[0]} $ssid"
-        elif [ $quality -lt 66 ] ; then
-            echo -e "net\t${network_icon[1]} $ssid"
+            net_status="off"
         else
-            echo -e "net\t${network_icon[2]} $ssid"
+            net_status="${network_icon[0]} $ssid $quality%"
         fi
 
     elif [ $int == $eth ] ; then
-        echo -e "net\t${network_icon[3]} ethernet"
+        net_status="${network_icon[1]} Ethernet"
     else
-        echo -e "net\toff"
+        net_status="off"
     fi
+
+    echo -e "net\t$net_status"
 }
 
 battery()
 {
-    # Battery
-    if $(test -e /sys/class/power_supply/BAT1) ; then
+    # Batteries
+    bat_info="off"
+    for bat in $(find /sys/class/power_supply | grep BAT); do
+        nr="${bat: -1}"
+        bat_info=""
 
-        bat_lvl=$(cat /sys/class/power_supply/BAT1/capacity)
-        bat_state=$(cat /sys/class/power_supply/BAT1/status)
+        bat_lvl=$(cat /sys/class/power_supply/BAT0/capacity)
+        bat_state=$(cat /sys/class/power_supply/BAT0/status)
 
         if [ $bat_state == "Charging" ] ; then
-            bat_status="${battery_icon[4]}"
+            bat_status="${battery_icon[5]}"
         elif [ $bat_lvl -lt 10 ] ; then
             bat_status="${F$acolor_accent}${battery_icon[0]}${F-}"
-        elif [ $bat_ -lt 33 ] ; then
+        elif [ $bat_ -lt 25 ] ; then
             bat_status="${battery_icon[1]}"
-        elif [ $bat_lvl -lt 66 ] ; then
+        elif [ $bat_ -lt 50 ] ; then
             bat_status="${battery_icon[2]}"
-        else
+        elif [ $bat_lvl -lt 75 ] ; then
             bat_status="${battery_icon[3]}"
+        else
+            bat_status="${battery_icon[4]}"
         fi
 
-        echo -e "battery\t$bat_status $bat_lvl%%%{F-}"
-    else
-        echo -e "battery\toff"
-    fi
+        bat_info+="$nr: $bat_status $bat_lvl%%{F-}"
+    done
+    echo -e "battery\t$bat_info"
 }
 
 clock()
 {
     echo -e $(date +$"date\t%{F$acolor_fg}%H:%M:%S %{F$acolor_fg}(%d-%m-%Y)%{F-}")
 }
+
+# vim: set ts=4 sw=4 tw=0 et :
diff --git a/herbstluftwm/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/populate_panel.sh
index 41952a6..7afa0c3 100755
--- a/herbstluftwm/.config/herbstluftwm/panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/populate_panel.sh
@@ -1,39 +1,21 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-hc() {
-        "${herbstclient_command[@]:-herbstclient}" "$@" ;
-}
+source "$HLWM_CONF_DIR/themes/current"
+source "$HLWM_CONF_DIR/panel_indicators.sh"
 
-dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source "$dir/theme.sh"
-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,$font_sec -u 2 -B $acolor_bg -F $acolor_fg"
-
-hc pad $monitor $(echo "$panel_h + $window_p" | bc)
+monitor=$1
 
 if awk -Wv 2>/dev/null | head -1 | grep -q '^mawk'; then
     # mawk needs "-W interactive" to line-buffer stdout correctly
     # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593504
     uniq_linebuffered() {
-      awk -W interactive '$0 != l { print ; l=$0 ; fflush(); }' "$@"
+        awk -W interactive '$0 != l { print ; l=$0 ; fflush(); }' "$@"
     }
 else
     # other awk versions (e.g. gawk) issue a warning with "-W interactive", so
     # we don't want to use it there.
     uniq_linebuffered() {
-      awk '$0 != l { print ; l=$0 ; fflush(); }' "$@"
+        awk '$0 != l { print ; l=$0 ; fflush(); }' "$@"
     }
 fi
 
@@ -42,29 +24,36 @@ fi
     #   <eventname>\t<data> [...]
     # e.g.
     #   date    ^fg(#efefef)18:33^fg(#909090), 2013-10-^fg(#efefef)29
+
     while true ; do
-                music
-                volume
-                network
-                battery
-                clock
+        music
+        volume &
+        network &
+        battery &
+        clock &
         sleep 1 || break
     done > >(uniq_linebuffered) &
+
     childpid=$!
     hc --idle
     kill $childpid
+
 } 2> /dev/null | {
 
     IFS=$'\t' read -ra tags <<< "$(hc tag_status $monitor)"
+
     visible=true
+
     date=""
-        volume=""
-        battery=""
-        net=""
+    volume=""
+    battery=""
+    net=""
     windowtitle=""
+
+    separator="%{F$acolor_accent}|%{F-}"
+
     while true ; do
-        separator="%{F$acolor_accent}|%{F-}"
-        # draw tags
+
         for i in "${tags[@]}" ; do
             case ${i:0:1} in
                 '#')
@@ -85,15 +74,16 @@ fi
             esac
             echo -n "%{A:tag,${i:1}:} ${i:1} %{A}%{F-}%{U-u}%{B-}"
         done
+
         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"
 
-                #DO NOT REMOVE THIS ECHO
-                echo
+        #DO NOT REMOVE THIS ECHO
+        echo
 
         # wait for next event
         IFS=$'\t' read -ra cmd || break
@@ -102,38 +92,38 @@ fi
                 #echo "resetting tags" >&2
                 IFS=$'\t' read -ra tags <<< "$(hc tag_status $monitor)"
                 ;;
-                        music)
-                                music="${cmd[@]:1}"
-                                if [ $music == "off" ] ; then
-                                        music=""
-                                else
-                                        music="$music $separator%{B-} "
-                                fi
-                                ;;
-                        volume)
-                                volume="${cmd[@]:1}"
-                                if [ $volume == "off" ] ; then
-                                        volume=""
-                                else
-                                        volume="$volume $separator%{B-} "
-                                fi
-                                ;;
-                        net)
-                                net="${cmd[@]:1}"
-                                if [ $net = "off" ] ; then
-                                        net=""
-                                else
-                                        net="$net $separator%{B-} "
-                                fi
-                                ;;
-                        battery)
-                                battery="${cmd[@]:1}"
-                                if [ $battery == "off" ] ; then
-                                        battery=""
-                                else
-                                        battery="$battery $separator%{B-} "
-                                fi
-                                ;;
+            music)
+                music="${cmd[@]:1}"
+                if [ $music == "off" ] ; then
+                    music=""
+                else
+                    music="$music $separator%{B-} "
+                fi
+                ;;
+            volume)
+                volume="${cmd[@]:1}"
+                if [ $volume == "off" ] ; then
+                    volume=""
+                else
+                    volume="$volume $separator%{B-} "
+                fi
+                ;;
+            net)
+                net="${cmd[@]:1}"
+                if [ $net = "off" ] ; then
+                    net=""
+                else
+                    net="$net $separator%{B-} "
+                fi
+                ;;
+            battery)
+                battery="${cmd[@]:1}"
+                if [ $battery == "off" ] ; then
+                    battery=""
+                else
+                    battery="$battery $separator%{B-} "
+                fi
+                ;;
             date)
                 #echo "resetting date" >&2
                 date="${cmd[@]:1}"
@@ -143,18 +133,7 @@ fi
                 ;;
         esac
     done
-} 2> /dev/null | lemonbar $bar_opts | {
-        #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
-}
+
+} 2> /dev/null
+
+# vim: set ts=4 sw=4 tw=0 et :
diff --git a/herbstluftwm/.config/herbstluftwm/start.sh b/herbstluftwm/.config/herbstluftwm/start.sh
index f10fca6..53b9e45 100755
--- a/herbstluftwm/.config/herbstluftwm/start.sh
+++ b/herbstluftwm/.config/herbstluftwm/start.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 opts=($@)
 
diff --git a/herbstluftwm/.config/herbstluftwm/start_panel.sh b/herbstluftwm/.config/herbstluftwm/start_panel.sh
new file mode 100755
index 0000000..e573a53
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/start_panel.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+source "$HLWM_CONF_DIR/themes/current"
+source "$HLWM_CONF_DIR/panel_indicators.sh"
+
+# Check for valid monitors
+monitor=${1:-0}
+geometry=($(herbstclient monitor_rect "$monitor"))
+if [ -z "$geometry" ] ;then
+    echo "Invalid monitor $monitor"
+    exit 1
+fi
+
+# Make sure only one instanve per monitor is running
+lockfile="/tmp/start_panel-$monitor.lck"
+if [ -e "$lockfile" ] && kill -0 $(cat $lockfile); then
+    pkill -P $(cat $lockfile)
+fi
+trap "rm -f $lockfile; exit" INT TERM EXIT
+echo "$$" > "$lockfile"
+
+# 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)
+
+# Apply padding to make room for the panel
+hc pad $monitor $(echo "$panel_h + $window_p" | bc)
+
+# Start the panel
+$HLWM_CONF_DIR/populate_panel.sh $monitor |
+lemonbar -g ${panel_width}x${panel_h}+${x}+${y} -f "$font" -f "$icon_font" -u2 -B$acolor_bg -F$acolor_fg |
+$HLWM_CONF_DIR/panel_handler.sh
+
+# vim: set ts=4 sw=4 tw=0 et :
diff --git a/herbstluftwm/.config/herbstluftwm/themes/current b/herbstluftwm/.config/herbstluftwm/themes/current
new file mode 120000
index 0000000..8a80c5f
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/themes/current
@@ -0,0 +1 @@
+purpur
\ No newline at end of file
diff --git a/herbstluftwm/.config/herbstluftwm/theme.sh b/herbstluftwm/.config/herbstluftwm/themes/purpur
index 34e22a7..5fedc6d 100644
--- a/herbstluftwm/.config/herbstluftwm/theme.sh
+++ b/herbstluftwm/.config/herbstluftwm/themes/purpur
@@ -1,7 +1,9 @@
+#!/usr/bin/env bash
+
 # Get color from ~/.Xresources
 get_x_color() {
     xresources=$(cat ~/.Xresources)
-    color=$(echo $xresources | sed "s/.*\*color$1: \(#[0-9A-Fa-f]*\).*/\1/")
+    color=$(echo $xresources | sed "s/.*\*color$1: \(\#[0-9A-Fa-f]*\).*/\1/")
     echo $color
 }
 
@@ -18,9 +20,8 @@ wallpaper="$HOME/.config/herbstluftwm/poligons.png"
 window_p=20
 
 # Panel
-panel_h=24
-font="-*-fixed-medium-*-*-*-14-*-*-*-*-*-*-*"
-font_sec="-*-stlarch-medium-*-*-*-10-*-*-*-*-*-*-*"
+panel_h=25
+font="DejaVu Sans Mono-10"
 
 # Colors
 color_fg=$(get_x_color 15)