Update herbstluftwm

1 files changed, 7 insertions, 4 deletions

diff --git a/herbstluftwm/popups.sh b/herbstluftwm/popups.sh
index 0ba7d86..db75c0b 100755
--- a/herbstluftwm/popups.sh
+++ b/herbstluftwm/popups.sh
@@ -1,17 +1,20 @@
 #!/bin/bash
 
-dzen_bg="#444040"
+source ${HOME}/.config/herbstluftwm/fn.sh
+
+dzen_bg="$(get_xresources foreground)"
+dzen_fg="$(get_xresources background)"
 
 calendary() {
     (
         cal
-    ) | dzen2 -p -bg "${dzen_bg}" -x "1195" -y "25" -w "165" -h "20" -l "5" -sa "c" -ta "c" \
+    ) | dzen2 -p -bg "${dzen_bg}" -fg "${dzen_fg}" -x "1195" -y "27" -w "165" -h "20" -l "5" -sa "c" -ta "c" \
         -title-name "popup_sysinfo" -e 'onstart=uncollapse;button1=exit;button3=exit'
 }
 
 position(){
     pos=$(mpc | awk 'NR==2' | awk '{print $4}' | sed 's/(//' | sed 's/%)//')
-    bar=$(echo $pos | gdbar -w $1 -h 1.5 -fg "#FF3D00" -bg "#821D00")
+    bar=$(echo $pos | gdbar -w $1 -h 3.5 -fg "$(get_xresources color4)" -bg "$(get_xresources color8)")
     echo -n "$bar"
     return
 }
@@ -31,7 +34,7 @@ music() {
 ^p($padding)^ca(1,mpc prev)Prev^ca()   ^ca(1,mpc toggle)Play/Pause^ca()   ^ca(1,mpc stop)Stop^ca()   ^ca(1,mpc next)Next^ca()
 ^p($padding)$(position $(($popup_width - $padding)) )" 2> /dev/null
     sleep 1
-    done | dzen2 -p -bg "${dzen_bg}" -y 25 -x 967 -l 5 -u -w $(($popup_width + $padding)) -ta l -title-name "popup_mpd" -e 'onstart=uncollapse;button3=exit'
+    done | dzen2 -p -bg "${dzen_bg}" -fg "${dzen_fg}" -y 27 -x 1087 -l 5 -u -w $(($popup_width + $padding)) -ta l -title-name "popup_mpd" -e 'onstart=uncollapse;button3=exit'
 }
 
 case $1 in