X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=x%2F.local%2Fbin%2Fbar;h=cdc09f47534ca754512209a8f03a271d26b3e66e;hb=a7d3c9add0dcba3af30b89b3faa9e3b3857bd147;hp=76d6e065c968c21b8caaae503f1750dc31309b70;hpb=627af670b097344fd249983d5ea6fdc54f10c34e;p=dotfiles.git

diff --git a/x/.local/bin/bar b/x/.local/bin/bar
index 76d6e06..cdc09f4 100755
--- a/x/.local/bin/bar
+++ b/x/.local/bin/bar
@@ -1,19 +1,30 @@
 #!/bin/sh
-batprefix=/sys/class/power_supply/BAT0
-if [ -f $batprefix/charge_full -a -f $batprefix/charge_now ]; then
-	bat="⚡$(echo $(cat $batprefix/charge_now)*100/$(cat $batprefix/charge_full) | bc)% |"
+# battery
+if stat -t /sys/class/power_supply/BAT*/uevent >/dev/null 2>&1; then
+	for f in /sys/class/power_supply/BAT*/uevent; do
+		eval $(grep -v " " "$f")
+		bat="$bat⚡$((POWER_SUPPLY_CHARGE_NOW*100/POWER_SUPPLY_CHARGE_FULL))% ($POWER_SUPPLY_STATUS) | "
+	done
 fi
 
-if ip -br a | grep -q '^wlp'; then
-	wlan="$(/sbin/iwconfig 2>/dev/null | grep -oP '(?<=ESSID:\").*(?=\")')"
-	if [ -z "$wlan" ]; then
-		wlan="Not connected"
+# network adapters
+for int in $(ip link show | grep -Po '(?<=.: )[A-Za-z0-9]+(?=:)' | grep -v docker); do
+	if [ $(ip addr show dev $int | grep -Po "(?<=link/)\S+ ") = "ether" ]; then
+		net="$net$int: "
+		if /sbin/iwconfig $int >/dev/null 2>&1; then
+			net="$net$(/sbin/iwconfig $int | grep -Po '(?<=ESSID:").*(?=")') "
+		fi
+		net="$net($(ip addr show dev $int | grep -Po "(?<=inet )[0-9.]+")) | "
 	fi
-	wlan="W $wlan | "
-fi
+done
 
+# sound levels
 snd="♪ $(pactl list sinks | grep -Po "(?<=Volume: front)[^%]*" | grep -o "[0-9]\?[0-9][0-9]$" | head -n 1) | "
+
+# disk space
 dsk="Dsk: $(df -h | grep '/$' | awk '{print $4"/"$2}') | "
-date="$(date +"%Y-%m-%d %H:%M:%S") "
 
-echo "$wlan$snd$bat$dsk$date"
+# date
+date="$(date +"%Y-%m-%d %H:%M") "
+
+echo "$net$snd$bat$dsk$date"