From 4779d4f566b6998230dcedfcb3169b36e6b0389d Mon Sep 17 00:00:00 2001
From: Alexander Bocken <alexander@bocken.org>
Date: Fri, 8 Aug 2025 11:27:53 +0200
Subject: [PATCH] dwmblocks: update scripts to work with nerdfont, requiring
 trailing space, updated internet script to allow for WWAN

---
 .local/bin/statusbar/sb-getmail  |  2 +-
 .local/bin/statusbar/sb-internet | 17 +++++++++++++----
 .local/bin/statusbar/sb-news     |  2 +-
 .local/bin/statusbar/sb-volume   | 10 +++++-----
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.local/bin/statusbar/sb-getmail b/.local/bin/statusbar/sb-getmail
index 983d251..e7e3e88 100755
--- a/.local/bin/statusbar/sb-getmail
+++ b/.local/bin/statusbar/sb-getmail
@@ -1,4 +1,4 @@
 #!/bin/bash
 num=$(find ~/.local/share/mail/*/INBOX/new -type f | wc -l)
-[ $num != 0 ] && printf "%s" "$num"
+[ $num != 0 ] && printf " %s" "$num"
 printf '\n'
diff --git a/.local/bin/statusbar/sb-internet b/.local/bin/statusbar/sb-internet
index a7c7c07..6644c27 100755
--- a/.local/bin/statusbar/sb-internet
+++ b/.local/bin/statusbar/sb-internet
@@ -17,14 +17,23 @@ case $BLOCK_BUTTON in
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
+# WWAN
+if [ "$(cat /sys/class/net/ww*/operstate 2>/dev/null)" = 'up' ] ; then
+	wifiicon="$(awk '/^\s*w/ { print "" }' /proc/net/wireless)"
+elif [ "$(cat /sys/class/net/ww*/operstate 2>/dev/null)" = 'down' ] ; then
+	[ "$(cat /sys/class/net/ww*/flags 2>/dev/null)" = '0x1003' ] && wifiicon="" || wifiicon="❌"
+fi
+
 # Wifi
-if [ "$(cat /sys/class/net/w*/operstate 2>/dev/null)" = 'up' ] ; then
+if [ "$(cat /sys/class/net/wl*/operstate 2>/dev/null)" = 'up' ] ; then
 	wifiicon="$(awk '/^\s*w/ { print "" }' /proc/net/wireless)"
-elif [ "$(cat /sys/class/net/w*/operstate 2>/dev/null)" = 'down' ] ; then
-	[ "$(cat /sys/class/net/w*/flags 2>/dev/null)" = '0x1003' ] && wifiicon="" || wifiicon="❌"
+elif [ "$(cat /sys/class/net/wl*/operstate 2>/dev/null)" = 'down' ] ; then
+	[ "$(cat /sys/class/net/wl*/flags 2>/dev/null)" = '0x1003' ] && wifiicon="" || wifiicon="❌"
 fi
 
 # Ethernet
 [ "$(cat /sys/class/net/e*/operstate 2>/dev/null)" = 'up' ] && wifiicon=""
 
-printf "%s%s%s\n" "$wifiicon"
+
+
+printf "%s \n" "$wifiicon"
diff --git a/.local/bin/statusbar/sb-news b/.local/bin/statusbar/sb-news
index 45d992c..ad1c7a5 100755
--- a/.local/bin/statusbar/sb-news
+++ b/.local/bin/statusbar/sb-news
@@ -1,6 +1,6 @@
 #!/bin/sh
 num="$(newsboat -x print-unread | cut -f1 -d ' ' )"
 if  ! pgrep newsboat > /dev/null ; then
-	[ "$num" -gt 0 ] 2>/dev/null && printf "%s" "$num"
+	[ "$num" -gt 0 ] 2>/dev/null && printf " %s" "$num"
 	printf '\n'
 fi
diff --git a/.local/bin/statusbar/sb-volume b/.local/bin/statusbar/sb-volume
index 5d732a1..bb8e50a 100755
--- a/.local/bin/statusbar/sb-volume
+++ b/.local/bin/statusbar/sb-volume
@@ -16,7 +16,7 @@ esac
 vol="$(wpctl get-volume @DEFAULT_AUDIO_SINK@)"
 
 # If muted, print  and exit.
-[ "$vol" != "${vol%\[MUTED\]}" ] && echo  && exit
+[ "$vol" != "${vol%\[MUTED\]}" ] && echo   && exit
 
 vol="${vol#Volume: }"
 
@@ -30,10 +30,10 @@ split() {
 vol="$(printf "%.0f" "$(split "$vol" ".")")"
 
 case 1 in
-	$((vol >= 70)) ) icon="" ;;
-	$((vol >= 30)) ) icon="" ;;
-	$((vol >= 1)) ) icon="" ;;
-	* ) echo  && exit ;;
+	$((vol >= 70)) ) icon=" " ;;
+	$((vol >= 30)) ) icon=" " ;;
+	$((vol >= 1)) ) icon=" " ;;
+	* ) echo   && exit ;;
 esac
 
 echo "$icon$vol%"