From a15873ebb395987133edb8cb0f3356c78c6427a9 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Thu, 25 Oct 2018 21:10:13 +0200
Subject: [PATCH] gruvboxify things - and a can of worms

---
 autostart            | 19 ++++++++++++-------
 bindings.sh          |  1 -
 panel.sh => panel.py |  0
 rules.sh             |  5 +++--
 statusbar.sh         |  5 ++---
 styling.sh           |  4 ----
 tray.sh              |  4 +---
 wallpaper.sh         |  2 +-
 8 files changed, 19 insertions(+), 21 deletions(-)
 rename panel.sh => panel.py (100%)

diff --git a/autostart b/autostart
index 3737603..6fc6e4c 100755
--- a/autostart
+++ b/autostart
@@ -11,15 +11,20 @@ store_pid() {
     echo $! >> $PIDS_FILE
 }
 
+cd $(dirname $0)
+
+source ./gruvbox_colors.sh
+
 OLD_PIDS=$(cat $PIDS_FILE)
 kill $(echo $OLD_PIDS)
 rm $PIDS_FILE
 
 hc emit_hook reload
 
-~/.config/herbstluftwm/bindings.sh
-~/.config/herbstluftwm/rules.sh
-~/.config/herbstluftwm/styling.sh
+./wallpaper.sh
+./bindings.sh
+./rules.sh
+./styling.sh
 
 hc set tree_style '╾│ ├└╼─┐'
 hc unlock
@@ -31,15 +36,15 @@ statusbar_height=20
 for monitor in $(hc list_monitors | cut -d: -f1) ; do
     # start it on each monitor
     hc pad $monitor $panel_height 0 $statusbar_height 0
-    ~/.config/herbstluftwm/panel.sh $monitor & store_pid
-    ~/.config/herbstluftwm/statusbar.sh $monitor & store_pid
+    ./panel.py $monitor & store_pid
+    ./statusbar.sh $monitor & store_pid
 done
 
-~/.config/herbstluftwm/tray.sh & store_pid
+./tray.sh & store_pid
 udiskie --tray & store_pid
 
 systemctl --user restart sxhkd
 systemctl --user restart xautolock
-systemd-run --user --on-active=30 ~/local/bin/battery-warning.sh
+systemctl --user restart battery-warning.timer
 
 wmname LG3D
diff --git a/bindings.sh b/bindings.sh
index 4260f76..bca61ef 100755
--- a/bindings.sh
+++ b/bindings.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 hc() {
     herbstclient "$@"
diff --git a/panel.sh b/panel.py
similarity index 100%
rename from panel.sh
rename to panel.py
diff --git a/rules.sh b/rules.sh
index 9da640d..7d1b13f 100755
--- a/rules.sh
+++ b/rules.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 hc() {
     herbstclient "$@"
@@ -7,10 +6,12 @@ hc() {
 
 # rules
 hc unrule -F
-#hc rule class=XTerm tag=3 # move all xterms to tag 3
+
 hc rule focus=off # normally do not focus new clients
+
 # give focus to most common terminals
 hc rule class~'(.*[Rr]xvt.*|.*[Tt]erm|Konsole)' focus=on
+
 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)' manage=off
diff --git a/statusbar.sh b/statusbar.sh
index 5d3cc25..403484e 100755
--- a/statusbar.sh
+++ b/statusbar.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-source ./gruvbox_colors.sh
-font="Fira Code:pixelsize=11"
+font="Fira Code:pixelsize=16"
 
 function uniq_linebuffered() {
     awk -W interactive '$0 != l { print ; l=$0 ; fflush(); }' "$@"
@@ -52,5 +51,5 @@ panelGeometry=${geometry[2]}x${statusbar_height}+${x}+${y}
     | lemonbar \
         -g $panelGeometry \
         -f "$font" \
-        -B $GRUVBOX_DARK0 -F $GRUVBOX_LIGHT0 \
+        -B $GRUVBOX_DARK1 -F $GRUVBOX_LIGHT0 \
         -u 2
diff --git a/styling.sh b/styling.sh
index 771efa4..d159436 100755
--- a/styling.sh
+++ b/styling.sh
@@ -4,10 +4,6 @@ hc() {
     herbstclient "$@"
 }
 
-source ./gruvbox_colors.sh
-
-./wallpaper.sh
-
 # frame/window styling
 hc set frame_border_active_color "$GRUVBOX_DARK4"
 hc set frame_border_normal_color "$GRUVBOX_DARK0"
diff --git a/tray.sh b/tray.sh
index 549535d..7d1e7a8 100755
--- a/tray.sh
+++ b/tray.sh
@@ -1,12 +1,10 @@
 #!/usr/bin/env bash
 
-source ./gruvbox_colors.sh
-
 set $(herbstclient monitor_rect 0)
 
 TRAY_GEOMETRY=5x1+$(($3 - 100))+0
 stalonetray \
-    --background "$GRUVBOX_DARK0" \
+    --background "$GRUVBOX_DARK1" \
     --geometry $TRAY_GEOMETRY \
     --icon-size 20 \
     --kludges force_icons_size \
diff --git a/wallpaper.sh b/wallpaper.sh
index 59c70ea..b9215a4 100755
--- a/wallpaper.sh
+++ b/wallpaper.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# xsetroot -solid '#eee8d5'
+xsetroot -solid '$GRUVBOX_DARK0'
 
 # random wallpaper
 WALLPAPERDIR=$(dirname "$0")/wallpapers