dotfiles

commit 33498e2ac62d342729313836be4c887c7eb1b61e
parent 537750b2db15259056092988b1d0387344670cc6
Author: Alex Balgavy <alexander.balgavy@spaceapplications.com>
Date:   Mon, 16 Jun 2025 21:21:45 +0200

dwmlock scripts: misc improvements

Diffstat:
M
scripts/dwmblock-bluetooth
 | 
6
+++++-
M
scripts/dwmblock-cpu
 | 
8
+++++++-
M
scripts/dwmblock-internet
 | 
25
++++++++++++++++++++-----
M
scripts/dwmblock-volume
 | 
6
+++++-

4 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/scripts/dwmblock-bluetooth b/scripts/dwmblock-bluetooth
@@ -3,7 +3,11 @@
 
 case "$BUTTON" in
   1)
-    pgrep -f nmtui || "$TERMINAL" -e bluetoothctl
+    if pgrep -f bluetoothctl >/dev/null 2>&1; then
+      wmctrl -Fa bluetoothctl
+    else
+      "$TERMINAL" -e bluetoothctl
+    fi
     pkill -RTMIN+8 dwmblocks
     ;;
   3)
diff --git a/scripts/dwmblock-cpu b/scripts/dwmblock-cpu
@@ -4,7 +4,13 @@
 cache=/tmp/cpubarscache
 
 case "$BUTTON" in
-  1) pgrep -f /usr/bin/top || setsid -f "$TERMINAL" -e top ;;
+  1)
+    if pgrep -f /usr/bin/top >/dev/null 2>&1; then
+      wmctrl -Fa 'top'
+    else
+      setsid -f "$TERMINAL" -e top
+    fi
+    ;;
   6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
diff --git a/scripts/dwmblock-internet b/scripts/dwmblock-internet
@@ -3,16 +3,20 @@
 # Show wifi 📶 and percent strength or 📡 if none.
 # Show 🌐 if connected to ethernet or ❎ if none.
 # Show 🔒 if a vpn connection is active
-
+set -x
 # Interfaces:
 # (list with `nmcli --get-values GENERAL.DEVICE,GENERAL.TYPE device show`)
-wired=enxc84bd604a6e7
+wired="enp0s31f6 eth0"
 wireless=wlp0s20f3
 # there's probably a way to change these but I'd have to know all files to update...
 
 case "$BUTTON" in
   1)
-    pgrep -f nmtui || "$TERMINAL" -e nmtui
+    if pgrep -f nmtui >/dev/null 2>&1; then
+      wmctrl -Fa 'nmtui'
+    else
+      "$TERMINAL" -e nmtui
+    fi
     pkill -RTMIN+5 dwmblocks ;;
   2) notify "Connected to $(/sbin/iwgetid -r)" '' ;;
   3) notify Wireless "Toggling wireless..."
@@ -21,6 +25,7 @@ case "$BUTTON" in
   6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
+# Wireless
 case "$(cat /sys/class/net/$wireless/operstate 2>/dev/null)" in
   down)
     if rfkill list wlan | grep 'Soft blocked: no' >/dev/null 2>&1; then
@@ -33,8 +38,18 @@ case "$(cat /sys/class/net/$wireless/operstate 2>/dev/null)" in
   # up) wifiicon="$(awk '/^\s*e/ { print "📶", int($3 * 100 / 70) "% " }' /proc/net/wireless)" ;;
 esac
 
-ethicon="$(sed 's/down/❎/;s/up/🌐/' /sys/class/net/$wired/operstate 2>/dev/null)"
-if nmcli --terse device status | grep '^tun.*:connected' >/dev/null 2>&1; then
+# Wired
+ethicon=""
+for eth in $wired; do
+  ethicon="$ethicon$(cat /sys/class/net/$eth/operstate 2>/dev/null)"
+done
+case "$ethicon" in
+  *up*) ethicon='🌐';;
+  *) ethicon='❎';;
+esac
+
+# VPN
+if nmcli --terse device status | grep -e ':[^:]*tun[^:]*:connected' | grep -Ev '^(virbr|vnet|vboxnet)' >/dev/null 2>&1; then
   vpnicon=' 🔒'
 else
   vpnicon=' '
diff --git a/scripts/dwmblock-volume b/scripts/dwmblock-volume
@@ -4,7 +4,11 @@ sink="$(pactl get-default-sink)"
 source="$(pactl get-default-source)"
 case "$BUTTON" in
   1)
-    pgrep -f pulsemixer || setsid -f "$TERMINAL" -e pulsemixer
+    if pgrep -f pulsemixer >/dev/null 2>&1; then
+      wmctrl -Fa pulsemixer
+    else
+      setsid -f "$TERMINAL" -e pulsemixer
+    fi
     pkill -RTMIN+6 dwmblocks;;
   3)
     pactl -- set-source-mute "$source" toggle