X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=i3%2Fbar;h=30e24cea6e1de79e1edb606a1f0f554165578b15;hb=b78a9f27b37eca6b75ec1f2fc993c1e5b717609d;hp=fe35e720f3554773453bb9a71b929987d4c46d5f;hpb=cc4abfb3797934ea3fa1d7e93ab85a93fbf259b1;p=dotfiles.git

diff --git a/i3/bar b/i3/bar
index fe35e72..30e24ce 100755
--- a/i3/bar
+++ b/i3/bar
@@ -5,14 +5,21 @@ item(){
 
 battery(){
 	path=/sys/class/power_supply
-	now=$(($(cat "$path/BAT0/charge_now")*100/$(cat "$path/BAT0/charge_full")))%
+	now=$(($(cat "$path/BAT0/charge_now")*100/$(cat "$path/BAT0/charge_full")))
 	[ "$(cat "$path/ADP1/online")" -eq "1" ] && charge="(C)"
-	[ "$now" = "100%" ] && now="FULL"
-	echo -n "$now$charge"
+	[ "$now" -ge "100" ] && now="FULL"
+	echo -n "$now%$charge"
+}
+
+volume(){
+	mixer=$(amixer | head -5 | tail -1)
+	echo $mixer | grep "\[on\]" || mute="(M)"
+	volume=$(echo $mixer | grep -Po "(?<=\[)[0-9]{1,3}%")
+	echo -n "vol: $volume$mute"
 }
 
 while true;
 do
-	echo "$(battery) | $(date +%x\ %X)"
+	echo "$(volume) | $(battery) | $(date +%x\ %X)"
 	sleep 1
 done