volumectl uses pipewire and dwmblocks eselect news

2 files changed, 18 insertions, 9 deletions

diff --git a/.local/bin/dwmbar/dwmb-eselect b/.local/bin/dwmbar/dwmb-eselect
new file mode 100755
index 0000000..2544ab4
--- /dev/null
+++ b/.local/bin/dwmbar/dwmb-eselect
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+icon=" "
+
+total="$(eselect news count all)"
+unread="$(eselect news count new)"
+
+case "$total" in
+0) echo "" ;;
+*) echo "$icon $unread/$total" ;;
+esac
diff --git a/.local/bin/volumectl b/.local/bin/volumectl
index d8766b7..4f4bc6b 100755
--- a/.local/bin/volumectl
+++ b/.local/bin/volumectl
@@ -10,14 +10,12 @@
 #		If no second argument is given, the audio will be SET
 #		to a set percentage fixed by the first argument.
 case "$1" in
-	mute) amixer set Master toggle ;;
-		 *)  pcnt="$1"
-				 sign="$2"
-				 amixer set Master $pcnt%$sign ;;
+mute) wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle ;;
+*)
+	pcnt="$1"
+	sign="$2"
+	wpctl set-volume @DEFAULT_AUDIO_SINK@ "$pcnt%$sign"
+	;;
 esac
 
-mute=""
-vol=$(awk '/%/ {gsub(/[\[\]]/,""); print $4}' <(amixer sget Master))
-amixer sget Master | grep off && mute="(muted)"
-notify-send.sh -t 1000 --replace-file /tmp/vol-notif -a Volume "$vol $mute"
-
+notify-send.sh -t 1000 --replace-file /tmp/vol-notif -a $(wpctl get-volume @DEFAULT_AUDIO_SINK@)