4 files changed, 86 insertions, 93 deletions

diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index 0fb9ea7..b8f8898 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -2,6 +2,10 @@
 
 # this is a simple config for herbstluftwm
 
+hc() {
+    herbstclient "$@"
+}
+
 #get colors from .Xresources
 get_xcolor(){
         xresources=$(\
@@ -15,26 +19,23 @@ get_xcolor(){
 }
 
 #Wallpaper
-WALLPAPER=/home/tom/Pictures/ThDLxEW.jpg
+WALLPAPER=/home/tom/Pictures/rocks.jpg
 
 #Numix color palette
 LIGHT=$(get_xcolor 15)
 LLIGHT=$(get_xcolor 7)
-ACCENT=$(get_xcolor 9)
+ACCENT=$(get_xcolor 12)
 LDARK=$(get_xcolor 8)
 DARK=$(get_xcolor 0)
 
-#Panel
-PANEL_HEIGHT=24
-
-hc() {
-    herbstclient "$@"
-}
+#Panel and padding
+padding=20
+monitor_width=$(hc list_monitors | sed 's/^[0-9]: \([0-9]*\)x.*$/\1/')
+panel_height=24
+panel_width=$(echo "$monitor_width - (2 * $padding)" | bc)
 
 hc emir_hook reload
 
-xsetroot -solid $ACCENT
-
 # remove all existing keybindings
 hc keyunbind --all
 
@@ -45,7 +46,7 @@ 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 -h $PANEL_HEIGHT -p "Run:" -nb $DARK -nf $LIGHT -sb $ACCENT -sf $DARK
+hc keybind $Mod-grave spawn dmenu_run -h $panel_height -w $panel_width -x $padding -y $padding -p "Run:" -nb $DARK -nf $LIGHT -sb $ACCENT -sf $DARK
 hc keybind XF86AudioLowerVolume spawn amixer set Master 5%-
 hc keybind XF86AudioRaiseVolume spawn amixer set Master 5%+
 
@@ -94,7 +95,7 @@ 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-Right    use_index +1
 hc rename default "${tag_names[0]}" || true
 for i in ${!tag_names[@]} ; do
     hc add "${tag_names[$i]}"
@@ -156,7 +157,7 @@ hc attr theme.active.inner_color $DARK
 hc attr theme.active.outer_color $DARK
 hc attr theme.background_color $DARK
 
-hc set window_gap 20
+hc set window_gap $padding
 hc set frame_padding 0
 hc set smart_window_surroundings 0
 hc set smart_frame_surroundings 1
@@ -186,7 +187,7 @@ herbstclient set tree_style '╾│ ├└╼─┐'
 #Start panel in all monitors
 start_panel() {
         for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do
-                "$1" $monitor $PANEL_HEIGHT $LIGHT $LLIGHT $ACCENT $LDARK $DARK $2&
+                "$1" $monitor $panel_height $padding $LIGHT $LLIGHT $ACCENT $LDARK $DARK $2&
         done
 }
 
@@ -202,7 +203,7 @@ else
 fi
 
 #Wallpaper
-feh --bg-scale $WALLPAPER
+feh --bg-fill $WALLPAPER
 
 #Start compton if not running
 start_compton(){ compton -c -z & }
@@ -225,3 +226,12 @@ then
 else
         pulseaudio --start
 fi
+
+#Start xscreensaver
+if pgrep xscreensaver >> /dev/null
+then
+        kill $(pgrep xscreensaver)
+        xscreensaver -no-splash&
+else
+        xscreensaver -no-splash&
+fi
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index 087158b..dd95bd4 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -1,28 +1,23 @@
 #!/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]}
+hc() {
+        "${herbstclient_command[@]:-herbstclient}" "$@" ;
+}
 
 add_alpha_channel(){
         echo "$1" | \
         sed "s/.*#\([0-9a-fA-F]*\).*/#ff\1/"
 }
 
+monitor=${1:-0}
 panel_height=$2
-light=$(add_alpha_channel $3)
-llight=$(add_alpha_channel $4)
-accent=$(add_alpha_channel $5)
-ldark=$(add_alpha_channel $6)
-dark=$(add_alpha_channel $7)
+padding=$3
+
+light=$(add_alpha_channel $4)
+llight=$(add_alpha_channel $5)
+accent=$(add_alpha_channel $6)
+ldark=$(add_alpha_channel $7)
+dark=$(add_alpha_channel $8)
 
 font="-*-fixed-medium-*-*-*-14-*-*-*-*-*-*-*"
 #font=""
@@ -32,7 +27,17 @@ selected_txt=$dark
 normal_txt=$light
 inactive_txt=$llight
 
-hc pad $monitor $panel_height
+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]} + $padding" | bc)
+y=$(echo "${geometry[1]} + $padding" | bc)
+panel_width=$(echo "${geometry[2]} - (2 * $padding)" | bc)
+
+hc pad $monitor $(echo "$panel_height + $padding" | bc)
 
 if awk -Wv 2>/dev/null | head -1 | grep -q '^mawk'; then
     # mawk needs "-W interactive" to line-buffer stdout correctly
@@ -79,7 +84,7 @@ fi
                 # Network
                 iwconfig=$(iwconfig wlp3s0)
                 if [ -z $iwconfig ] ; then
-                        echo -e "wireless\toff"
+                        echo -e "net\toff"
                 else
                         ssid=$(\
                                 echo $iwconfig | \
@@ -89,33 +94,24 @@ fi
                         )
                         if [ $ssid = "off/any" ] ; then
                                 ifconf=$
-                                echo -e "wireless\t%{F$normal_txt}Wlan: No connection%{F-}"
-                        else    
-                                IFS=',' read -a quality_info <<< $(\ 
-                                        echo $iwconfig | \
-                                        sed "s/.*Link Quality=\([0-9]*\)\/\([0-9]*\).*/\1,\2/"\ 
-                                )
-                                cur_qual=${quality_info[0]}
-                                max_qual=${quality_info[1]}
-                                quality_p=$(echo "$cur_qual*100/$max_qual" | bc)
-                                echo -e "wireless\t%{F$normal_txt}Wlan: $quality_p%% %{F$inactive_txt}($ssid)%{F-}"
+                                echo -e "net\t%{F$normal_txt}Net: No connection%{F-}"
+                        else
+                                echo -e "net\t%{F$normal_txt}Net: $ssid%{F-}"
                         fi
                 fi
-                        
+
                 # Battery
-                IFS=' ' read -a batinfo <<< $(acpi -b)
-                if [ -z $batinfo ] ; then
-                        echo -e "battery\toff"
-                else 
-                        charge=$(echo ${batinfo[3]} | tr -d '%,')
+                if $(test -e /sys/class/power_supply/BAT1) ; then
+                        charge=$(cat /sys/class/power_supply/BAT1/capacity)
                         if [ $charge -lt 15 ] ; then
                                 bat_color=$accent
                         else
                                 bat_color=$normal_txt
                         fi
-                        state=$(echo ${batinfo[2]} | tr -d ',')
-                        remaining=$(echo ${batinfo[4]})
-                        echo -e "battery\t%{F$normal_txt}$state: %{F$bat_color}$charge%{F$normal_txt}%% %{F$inactive_txt}($remaining)%{F-}"
+                        state=$(cat /sys/class/power_supply/BAT1/status)
+                        echo -e "battery\t%{F$normal_txt}$state: %{F$bat_color}$charge%{F$normal_txt}%% %{F-}"
+                else
+                        echo -e "battery\toff"
                 fi
 
                 # Time
@@ -132,7 +128,7 @@ fi
     date=""
         volume=""
         battery=""
-        wireless=""
+        net=""
     windowtitle=""
     while true ; do
         separator="%{F$accent}|%{F-}"
@@ -159,9 +155,9 @@ fi
         done
         echo -n "$separator"
         echo -n "%{B-}%{F-} ${windowtitle//^/^^}"
-        
+
                 #Right part of panel
-        right="$volume$wireless$battery$date "
+        right="$volume$net$battery$date "
         echo -n "%{r}$right"
         echo
 
@@ -180,12 +176,12 @@ fi
                                         volume="$volume $separator%{B-} "
                                 fi
                                 ;;
-                        wireless)
-                                wireless="${cmd[@]:1}"
-                                if [ $wireless = "off" ] ; then
-                                        wireless=""
+                        net)
+                                net="${cmd[@]:1}"
+                                if [ $net = "off" ] ; then
+                                        net=""
                                 else
-                                        wireless="$wireless $separator%{B-} "
+                                        net="$net $separator%{B-} "
                                 fi
                                 ;;
                         battery)
diff --git a/Makefile b/Makefile
index 0e0dd70..1f21a25 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
-NUMIX = .local/share/themes/numix-no-title
+PWD=$(shell pwd)
+
+THEMES_DIR = .local/share/themes
+CONFIG_DIR = .config
+NUMIX = numix-no-title
 BASHRC = .bashrc
 VIMRC = .vimrc
-HERBSTLUFT = .config/herbstluftwm
+HERBSTLUFT = herbstluftwm
 XRESOURCES = .Xresources
 
 
@@ -9,42 +13,25 @@ install: all
 
 all:  bash vim xresources numix-no-title herbstluftwm
 
-numix-no-title: 
-        #create wm theme dir if not exist
-        mkdir -p  ~/$(NUMIX)
-
-        #remove content if existing
-        -rm -rf ~/$(NUMIX)/*
-
-        #copy new contents in
-        cp -rf $(NUMIX)/* ~/$(NUMIX)/
+numix-no-title:
+        ln -sf $(PWD)/$(THEMES_DIR)/$(NUMIX) ~/$(THEMES_DIR)
 
 herbstluftwm:
-        #create herbstluftwm if not exist
-        mkdir -p ~/$(HERBSTLUFT)
-
-        #remove content if existing
-        -rm -rf ~/$(HERBSTLUFT)/*
-
-        #copy new contents in 
-        cp -rf $(HERBSTLUFT)/* ~/$(HERBSTLUFT)/
+        ln -sf $(PWD)/$(CONFIG_DIR)/$(HERBSTLUFT) ~/$(CONFIG_DIR)
 
 bash:
-        #copy bashrc to home
-        cp -f $(BASHRC) ~
+        ln -sf $(PWD)/$(BASHRC) ~
 
 vim:
-        #copy vimrc to home
-        cp -f $(VIMRC) ~
+        ln -sf $(PWD)/$(VIMRC) ~
 
 xresources:
-        #copy Xresources to home
-        cp -f $(XRESOURCES) ~
+        ln -sf $(PWD)/$(XRESOURCES) ~
 
-uninstall: 
+uninstall:
         #remove all
-        -rm -rf ~/$(WM-THEME-DIR)
-        -rm -rf ~/$(HERBSTLUFT)
-        -rm -f ~/$(BASHRC)
-        -rm -f ~/$(VIMRC)
-        -rm -f ~/$(XRESOURCES)
+        -rm ~/$(THEMES_DIR)/$(NUMIX)
+        -rm ~/$(CONFIG_DIR)/$(HERBSTLUFT)
+        -rm ~/$(BASHRC)
+        -rm ~/$(VIMRC)
+        -rm ~/$(XRESOURCES)
diff --git a/README.md b/README.md
index e2dd91d..a541fc9 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Toms Dotfiles
 Recently I've been discovering tiling window managers and how nice it is to customize my desktop.
 This means I've got a "lot" of dotfiles wanting to share across my machines and with everyone who is interested.
 ###How to install
-You can 
+You can
  - copy the files to your home directory
 
 or
@@ -17,7 +17,7 @@ The makefile has multiple recepies:
  - vim: Installs my vimrc file
  - xresources: Installs my xresources file
  - install: Does all of the above
- - uninstall: uninstall all my makefiles
+ - uninstall: uninstall all my dotfiles
 
 ###Disclaimer
 I am not responsible for the loss of any of your files! You should make a backup before installing anything!