1 files changed, 28 insertions, 19 deletions
diff --git a/.local/bin/statusbar/sb-internet b/.local/bin/statusbar/sb-internet
index 74a4e28..8f0a3f6 100755
--- a/.local/bin/statusbar/sb-internet
+++ b/.local/bin/statusbar/sb-internet
@@ -4,31 +4,40 @@
 # Show 🌐 if connected to ethernet or ❎ if none.
 # Show 🔒 if a vpn connection is active
 
-printconnection() {
-  [ "$(cat /sys/class/net/eth0/operstate 2>/dev/null)" = 'up' ] && ethericon="🌐" || ethericon="❎"
-  [ -n "$(cat /sys/class/net/wg0/operstate 2>/dev/null)" ] && tunicon=" 🔒"
-  printf "%s%s%s\n" "$wifiicon" "$ethericon" "$tunicon"
+togglevpn() {
+   if [ ! -n "$(cat /sys/class/net/wg0/operstate 2>/dev/null)" ];then
+     doas wg-quick up wg0
+     notify-send "🔒 Internet module" "Connected to VPN"
+   else
+     doas wg-quick down wg0
+     notify-send "🔒 Internet module" "Disconnected from VPN"
+   fi
 }
 
-if [ ! -n "$1" ]; then
-  printconnection
-else
-  if [ "$1" -eq 1 ]; then
-    if [ ! -n "$(cat /sys/class/net/wg0/operstate 2>/dev/null)" ];then
-      doas wg-quick up wg0
-      notify-send "🔒 Internet module" "Connected to VPN"
-    else
-      doas wg-quick down wg0
-      notify-send "🔒 Internet module" "Disconnected from VPN"
-    fi
-  elif [ "$1" -eq 3 ]; then
-    notify-send "🌐 Internet module" "\- Click to connect
+case $1 in
+	1) togglevpn 2>/dev/null ;;
+	3) notify-send "🌐 Internet module" "\- Click to enable/disable VPN
 ❌: wifi disabled
 📡: no wifi connection
 📶: wifi connection with quality
 ❎: no ethernet
 🌐: ethernet working
 🔒: vpn is active
-"
-  fi
+" ;;
+	6) kitty -e "$EDITOR" "$0" ;;
+esac
+
+# Wifi
+if [ "$(cat /sys/class/net/w*/operstate 2>/dev/null)" = 'up' ] ; then
+	wifiicon="$(awk '/^\s*w/ { print "📶", int($3 * 100 / 70) "% " }' /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="❌ "
 fi
+
+# Ethernet
+[ "$(cat /sys/class/net/e*/operstate 2>/dev/null)" = 'up' ] && ethericon="🌐" || ethericon="❎"
+
+# Wireguard 
+[ -n "$(cat /sys/class/net/wg*/operstate 2>/dev/null)" ] && tunicon=" 🔒"
+
+printf "%s%s%s\n" "$wifiicon" "$ethericon" "$tunicon"