From dee1ae0c13c3b70ad6a9f40416ad0b415c36aba1 Mon Sep 17 00:00:00 2001
From: Justine Smithies <justine@smithies.me.uk>
Date: Sun, 24 Dec 2023 19:02:01 +0000
Subject: Now uses pactl for volume +/- and mute

---
 .config/river/init        | 9 ++++++---
 .config/yambar/config.yml | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.config/river/init b/.config/river/init
index e146d10..4a60a20 100755
--- a/.config/river/init
+++ b/.config/river/init
@@ -174,9 +174,12 @@ riverctl map passthrough Super F11 enter-mode normal
 for mode in normal locked
 do
     # Control volume 
-    riverctl map $mode None XF86AudioRaiseVolume  spawn 'amixer sset Master 2%+'
-    riverctl map $mode None XF86AudioLowerVolume  spawn 'amixer sset Master 2%-'
-    riverctl map $mode None XF86AudioMute         spawn 'amixer set Master 1+ toggle'
+    #riverctl map $mode None XF86AudioRaiseVolume  spawn 'amixer sset Master 2%+'
+    riverctl map $mode None XF86AudioRaiseVolume  spawn 'pactl set-sink-volume @DEFAULT_SINK@ +2%'
+    #riverctl map $mode None XF86AudioLowerVolume  spawn 'amixer sset Master 2%-'
+    riverctl map $mode None XF86AudioLowerVolume  spawn 'pactl set-sink-volume @DEFAULT_SINK@ -2%'
+    #riverctl map $mode None XF86AudioMute         spawn 'amixer set Master 1+ toggle'
+    riverctl map $mode None XF86AudioMute         spawn 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
 
     # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
     riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
diff --git a/.config/yambar/config.yml b/.config/yambar/config.yml
index 0048d22..9ef06c9 100644
--- a/.config/yambar/config.yml
+++ b/.config/yambar/config.yml
@@ -109,14 +109,14 @@ bar:
                 string:
                   text: "0%"
                   on-click:
-                    middle: sh -c "amixer set Master 1+ toggle"
+                    middle: sh -c "pactl set-sink-mute @DEFAULT_SINK@ toggle"
               ~muted:
                 string:
                   text: "{cubic_volume}%"
                   on-click:
-                    left: sh -c "amixer sset Master 2%-"
-                    middle: sh -c "amixer set Master 1+ toggle"
-                    right: sh -c "amixer sset Master 2%+"
+                    left: sh -c "pactl set-sink-volume @DEFAULT_SINK@ -2%"
+                    middle: sh -c "pactl set-sink-mute @DEFAULT_SINK@ toggle"
+                    right: sh -c "pactl set-sink-volume @DEFAULT_SINK@ +2%"
         content:
           list:
             items:
-- 
cgit v1.2.3