mpd, weather and mail blocks improved

3 files changed, 4 insertions, 5 deletions

diff --git a/.scripts/i3mail b/.scripts/i3mail
index 9b4aa3e..becb085 100755
--- a/.scripts/i3mail
+++ b/.scripts/i3mail
@@ -2,4 +2,4 @@
 case $BLOCK_BUTTON in
     1) $TERMINAL -e neomutt ;;
 esac
-echo $(find ~/.mail -wholename */INBOX/new/* | wc -l)
+echo $(find ~/.mail -wholename */INBOX/new/* | wc -l | sed -e "s/^0$//g")
diff --git a/.scripts/i3mpd b/.scripts/i3mpd
index b2a34bb..7cf473d 100755
--- a/.scripts/i3mpd
+++ b/.scripts/i3mpd
@@ -6,8 +6,8 @@ if [[ -n $BLOCK_INSTANCE ]]; then
 fi
 
 filter() {
-    tr '\n' ' ' | grep -Po '.*(?= \[playing\])|paused' | tr -d '\n'
-}
+	sed 2q | tac | sed -e "/volume:/d;s/\[paused\].*/<span color=\"gray\">/g;s/\[playing\].*/<span>/g" | tr -d '\n' | sed -e "s/$/<\/span>/g"
+	}
 
 case $BLOCK_BUTTON in
     1) mpc $password status | filter && $TERMINAL -e ncmpcpp & disown ;;  # right click, pause/unpause
diff --git a/.scripts/i3weather b/.scripts/i3weather
index 3000b8a..a2fef4e 100755
--- a/.scripts/i3weather
+++ b/.scripts/i3weather
@@ -12,7 +12,6 @@ if [[ "$location" != "" ]]
 fi
 curl -s wttr.in/$location > ~/.weatherreport
 
-echo -n ☔ $(cat ~/.weatherreport | sed -n 16p | sed -e 's/[^m]*m//g' | grep -o "[0-9]*%" | sort -n | sed -e '$!d')
+echo -n $(cat ~/.weatherreport | sed -n 16p | sed -e 's/[^m]*m//g' | grep -o "[0-9]*%" | sort -n | sed -e "$!d;s/^/☔ /")
 
 cat ~/.weatherreport | sed -n 13p | sed -e 's/[^m]*m//g;s/[^0-9]/ /g;s/ /\n/g;/^s*$/d' | grep [0-9] | sort -n | sed -e 1b -e '$!d' | tr '\n' ' ' | awk '{print " ❄️",$1 "°","☀️",$2 "°"}'
-