From 46d14d8bb8003dce64770c4ba5abbbf5903e971e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 12 Apr 2020 09:45:06 +0200
Subject: tv xmonad: add pavucontrol

---
 tv/5pkgs/haskell/xmonad-tv/src/Paths.hs | 3 +++
 tv/5pkgs/haskell/xmonad-tv/src/main.hs  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
index 3a879b5..dd21511 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 c528017..400c87a 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"]
-- 
cgit v1.2.3


From e613c199203b9f90cc7e4f97c7b1825abb02aa56 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 18:48:54 +0200
Subject: lib: add stripAttr

---
 lib/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index 14e6e27..5a948bb 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -49,6 +49,8 @@ let
 
     indent = replaceChars ["\n"] ["\n  "];
 
+    stripAttr = converge (filterAttrsRecursive (n: v: v != {} && v != null));
+
     mapNixDir = f: x: {
       list = foldl' mergeAttrs {} (map (mapNixDir1 f) x);
       path = mapNixDir1 f x;
-- 
cgit v1.2.3