summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorJeschli <jeschli@gmail.com>2020-04-22 12:35:00 +0200
committerJeschli <jeschli@gmail.com>2020-04-22 12:35:00 +0200
commit3c0496ec1a774c539cf10311bff821ff07ddbf01 (patch)
tree9fbafe92c3f26571bb562255d86ffcc2975216ea /tv
parent119a7cfe5a87323ec7231c263abc444229564a1c (diff)
parentcabaf519b5970cbe5c1e57832d3bd12da4f47371 (diff)
Merge branch 'master' of https://cgit.lassul.us/stockholm
Diffstat (limited to 'tv')
-rw-r--r--tv/5pkgs/haskell/xmonad-tv/src/Paths.hs3
-rw-r--r--tv/5pkgs/haskell/xmonad-tv/src/main.hs3
2 files changed, 6 insertions, 0 deletions
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
index 3a879b5d0..dd21511b4 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
@@ -12,6 +12,9 @@ pactl = findExecutable "pactl"
passmenu :: FilePath
passmenu = findExecutable "passmenu"
+pavucontrol :: FilePath
+pavucontrol = findExecutable "pavucontrol"
+
slock :: FilePath
slock = findExecutable "slock"
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index c528017d7..400c87ab9 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -160,6 +160,7 @@ myKeys conf = Map.fromList $
, ((0, xF86XK_AudioLowerVolume), audioLowerVolume)
, ((0, xF86XK_AudioRaiseVolume), audioRaiseVolume)
, ((0, xF86XK_AudioMute), audioMute)
+ , ((_4, xF86XK_AudioMute), pavucontrol [])
, ((_4, xK_Prior), forkFile Paths.xcalib ["-invert", "-alter"] Nothing)
]
@@ -175,6 +176,8 @@ myKeys conf = Map.fromList $
_4SM = _4 .|. _S .|. _M
pactl args = forkFile Paths.pactl args Nothing
+ pavucontrol args = forkFile Paths.pavucontrol 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"]