X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=i3%2Fbar;h=cdebaf874829c9485cd82123078c9e0b88096330;hb=2a8eabb8186791663e2aa8a57c3400eb91f2fa75;hp=24b05f348c66ece4f7bd7d6ca7f29d3ab7d8a01f;hpb=7df7ab410d3a07d88f42cb9a83752d11f3093001;p=dotfiles.git

diff --git a/i3/bar b/i3/bar
index 24b05f3..cdebaf8 100755
--- a/i3/bar
+++ b/i3/bar
@@ -1,12 +1,6 @@
 #!/bin/bash
-function music {
-	song=$([ "$(mpc | wc -l)" = "1" ] && echo "[stopped]" || echo $(mpc | head -1))
-	status=$(mpc | grep -o "\[p.*\]")
-	echo -ne "♪: $song$status | "
-}
-
 function net {
-	cat /run/network/ifstate | grep -q $1 && echo "$2 | "
+	grep -q "$1" /run/network/ifstate && echo "$2 <$(iwconfig "$1" 2>/dev/null | grep -Po "(?<=ESSID:\").*(?=\")")> | "
 }
 
 function volume {
@@ -30,6 +24,6 @@ function battery {
 }
 
 while [ 1 ]; do
-	echo "$(music)$(volume)$(net wlan0 W)$(net eth0 E)$(net usb0 U)$(temp)$(battery)$(date +%y-%m-%d\ %H:%M)"
+	echo "$(volume)$(net wlan0 W)$(net eth0 E)$(net usb0 U)$(temp)$(battery)$(date +%y-%m-%d\ %H:%M)"
 	sleep 5
 done