From 4f91067458f15e3d87c751fc972c987fd8b5849e Mon Sep 17 00:00:00 2001
From: exu <mrc@frm01.net>
Date: Fri, 21 Jun 2024 23:22:23 +0200
Subject: [PATCH] Use pipewire. Built-in bar for volume instead of custom hack

---
 arch-config/scripts/dunst/dunst-volume.sh | 26 +++++++++--------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/arch-config/scripts/dunst/dunst-volume.sh b/arch-config/scripts/dunst/dunst-volume.sh
index 2af6a014..46f9efcc 100755
--- a/arch-config/scripts/dunst/dunst-volume.sh
+++ b/arch-config/scripts/dunst/dunst-volume.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 set -euo pipefail
 
 # You can call this script like this:
@@ -8,45 +7,40 @@ set -euo pipefail
 # $./dunst-volume.sh mute
 
 get_volume() {
-    amixer -D pulse get Master | grep '%' | head -n 1 | cut -d '[' -f 2 | cut -d '%' -f 1
+    amixer -D pipewire get Master | grep '%' | head -n 1 | cut -d '[' -f 2 | cut -d '%' -f 1
 }
 
 is_mute() {
-    amixer -D pulse get Master | grep '%' | grep -oE '[^ ]+$' | grep off >/dev/null
+    amixer -D pipewire get Master | grep '%' | grep -oE '[^ ]+$' | grep off >/dev/null
 }
 
 send_notification() {
-    # Make the bar with the special character ─ (it's not dash -)
-    # https://en.wikipedia.org/wiki/Box-drawing_character
-    #bar=$(seq -s "─" $(($volume / 5)) | sed 's/[0-9]//g')
+    volume=$(get_volume)
     # Send the notification
-    #dunstify -i audio-volume-high -r 2593 -a volume-script "$volume    $bar    "
-    dunstify -i audio-volume-high -a volume-script -h int:value:$volume "Volume"
+    dunstify -i audio-volume-high -r 2593 -a volume-script -h int:value:$volume "Volume - ${volume}%"
 }
 
-
-volume=$(get_volume)
-
 case $1 in
     up)
-        send_notification
         # Set the volume on (if it was muted)
         amixer -D pipewire set Master on >/dev/null
         # Up the volume (+ 5%)
         amixer -D pipewire sset Master 5%+ >/dev/null
+        send_notification
         ;;
     down)
-        send_notification
         amixer -D pipewire set Master on >/dev/null
         amixer -D pipewire sset Master 5%- >/dev/null
+        send_notification
         ;;
     mute)
+        # Toggle mute
+        amixer -D pipewire set Master 1+ toggle >/dev/null
         if is_mute; then
-            dunstify -i audio-volume-muted -a volume-script -h int:value:$volume "Mute"
+            volume=$(get_volume)
+            dunstify -i audio-volume-muted -r 2593 -a volume-script -h int:value:$volume "Mute"
         else
             send_notification
         fi
-        # Toggle mute
-        amixer -D pipewire set Master 1+ toggle >/dev/null
         ;;
 esac