tv xmonad: amixer -> pactl

3 files changed, 12 insertions, 8 deletions

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 9cb48725..22c94f7b 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -96,8 +96,8 @@ in {
       ]);
     };
     path = [
-      pkgs.alsaUtils
       pkgs.fzmenu
+      pkgs.pulseaudioLight.out
       pkgs.rxvt_unicode
     ];
     serviceConfig = {
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
index 24a809bf..e12c25bd 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
@@ -3,12 +3,12 @@ module Paths where
 import Helpers.Path
 
 
-amixer :: FilePath
-amixer = findExecutable "amixer"
-
 otpmenu :: FilePath
 otpmenu = findExecutable "otpmenu"
 
+pactl :: FilePath
+pactl = findExecutable "pactl"
+
 passmenu :: FilePath
 passmenu = findExecutable "passmenu"
 
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index dd76fbf6..c96a8539 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -147,9 +147,10 @@ myKeys conf = Map.fromList $
     , ((_4  , xK_Delete ), removeEmptyWorkspace)
 
     , ((_4  , xK_Return ), toggleWS)
-    , ((noModMask, xF86XK_AudioLowerVolume), amixer ["sset", "Master", "5%-"])
-    , ((noModMask, xF86XK_AudioRaiseVolume), amixer ["sset", "Master", "5%+"])
-    , ((noModMask, xF86XK_AudioMute), amixer ["sset", "Master", "toggle"])
+
+    , ((0, xF86XK_AudioLowerVolume), audioLowerVolume)
+    , ((0, xF86XK_AudioRaiseVolume), audioRaiseVolume)
+    , ((0, xF86XK_AudioMute), audioMute)
     ]
     where
     _4 = mod4Mask
@@ -162,7 +163,10 @@ myKeys conf = Map.fromList $
     _4CM = _4 .|. _C .|. _M
     _4SM = _4 .|. _S .|. _M
 
-    amixer args = forkFile Paths.amixer args Nothing
+    pactl args = forkFile Paths.pactl args Nothing
+    audioLowerVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "-5%"]
+    audioRaiseVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "+5%"]
+    audioMute = pactl ["--", "set-sink-mute", "@DEFAULT_SINK@", "toggle"]
 
 
 pagerConfig :: PagerConfig