4 files changed, 36 insertions, 20 deletions
diff --git a/.local/bin/b-bar b/.local/bin/b-bar
new file mode 100755
index 0000000..e326673
--- /dev/null
+++ b/.local/bin/b-bar
@@ -0,0 +1,13 @@
+#!/bin/sh
+while true
+do
+    b0="/sys/class/power_supply/BAT0"
+    bat="$(cat $b0/capacity)"
+    # batl="$(cat $b0/capacity_level)"
+    vols="$(b-pavols)"
+    load="$(cat /proc/loadavg | cut -d' ' -f1)"
+    time="$(date +'%a, %d %b %Y %R %z')"
+    printf "%s%% | %s | %s | %s\n" \
+           "$bat" "$vols" "$load" "$time"
+    sleep 5
+done
diff --git a/.local/bin/pacify-pulseaudio b/.local/bin/b-pacify
index 18d6ee5..18d6ee5 100755
--- a/.local/bin/pacify-pulseaudio
+++ b/.local/bin/b-pacify
diff --git a/.local/bin/b-pavols b/.local/bin/b-pavols
new file mode 100755
index 0000000..76606e2
--- /dev/null
+++ b/.local/bin/b-pavols
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# default sink (output)
+sink_volume="$(pactl get-sink-volume @DEFAULT_SINK@ | grep -Po '\d+(?=%)' | head -n1)"
+sink_mute="$(pactl get-sink-mute @DEFAULT_SINK@ | grep -o 'no\|yes')"
+# default source (input)
+source_volume="$(pactl get-source-volume @DEFAULT_SOURCE@ | grep -Po '\d+(?=%)' | head -n1)"
+source_mute="$(pactl get-source-mute @DEFAULT_SOURCE@ | grep -o 'no\|yes')"
+
+if [ "$sink_mute" = "no" ]; then
+    sink_mute='+'
+else
+    sink_mute='-'
+fi
+
+if [ "$source_mute" = "no" ]; then
+    source_mute='+'
+else
+    source_mute='-'
+fi
+
+printf "%s%s,%s%s\n" \
+       "$sink_volume" "$sink_mute" "$source_volume" "$source_mute"
diff --git a/.local/bin/my-bar b/.local/bin/my-bar
deleted file mode 100755
index 8a37d2f..0000000
--- a/.local/bin/my-bar
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-while true
-do
-    b0="/sys/class/power_supply/BAT0"
-    bat="$(cat $b0/capacity)"
-    # batl="$(cat $b0/capacity_level)"
-    sinkv="$(pactl get-sink-volume @DEFAULT_SINK@ | grep -Po '\d+(?=%)' | head -n1)"
-    sinkm="$(pactl get-sink-mute @DEFAULT_SINK@ | grep -o 'no\|yes')"
-    srcv="$(pactl get-source-volume @DEFAULT_SOURCE@ | grep -Po '\d+(?=%)' | head -n1)"
-    srcm="$(pactl get-source-mute @DEFAULT_SOURCE@ | grep -o 'no\|yes')"
-    [ "$sinkm" = "no" ] && sinkm='+' || sinkm='-'
-    [ "$srcm" = "no" ] && srcm='+' || srcm='-'
-    load="$(cat /proc/loadavg | cut -d' ' -f1)"
-    time="$(date +'%a, %d %b %Y %R %z')"
-	printf "%s%% | %s%s,%s%s | %s | %s\n" \
-           "$bat" \
-           "$sinkv" "$sinkm" "$srcv" "$srcm" \
-           "$load" "$time"
-	sleep 5
-done