summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-01-14 15:51:41 +0100
committertv <tv@krebsco.de>2016-01-14 15:51:41 +0100
commitf648c930fe2da2760b86c4bcf35b9e05803b8534 (patch)
treed3f6960738e10674f4199ce3d8dd7afc62fd4c60 /tv/2configs
parent7c97b64549913863498c4dca214cd9a890a0d00c (diff)
tv: install pavucontrol only when xserver is enabled
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/pulse.nix6
-rw-r--r--tv/2configs/xserver/default.nix1
2 files changed, 5 insertions, 2 deletions
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index 55ee8d8e4..e1894ca64 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -45,7 +45,11 @@ in
#"pulse/client.conf".source = mkForce clientConf;
"pulse/default.pa".source = configFile;
};
- systemPackages = [ pkg ];
+ systemPackages = [
+ pkg
+ ] ++ optionals config.services.xserver.enable [
+ pkgs.pavucontrol
+ ];
};
# Allow PulseAudio to get realtime priority using rtkit.
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index facde4e76..5cd17aa1d 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -37,7 +37,6 @@ let
pkgs.ff
pkgs.gitAndTools.qgit
pkgs.mpv
- pkgs.pavucontrol
pkgs.slock
pkgs.sxiv
pkgs.xsel