summaryrefslogtreecommitdiffstats
path: root/lass/2configs/baseX.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-06-23 17:04:07 +0200
committermakefu <github@syntax-fehler.de>2016-06-23 17:04:07 +0200
commit271a59b1d6222f7336fac427631ee5bb569a000e (patch)
tree804b845cebb530001e79b16ddcb70d2d12d8c7f5 /lass/2configs/baseX.nix
parentd5e0dcccd074d7e63cfa7fff35782cb92c101270 (diff)
parenta8dcedbb99151ce396d58573f339fa34d7537fa1 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/baseX.nix')
-rw-r--r--lass/2configs/baseX.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 7e969b3ed..6d26ff89a 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -8,7 +8,13 @@ in {
#./urxvt.nix
./xserver
./mpv.nix
+ #./pulse.nix
+ ./power-action.nix
];
+ hardware.pulseaudio = {
+ enable = true;
+ systemWide = true;
+ };
users.extraUsers.mainUser.extraGroups = [ "audio" ];
@@ -16,11 +22,6 @@ in {
virtualisation.libvirtd.enable = true;
- hardware.pulseaudio = {
- enable = true;
- systemWide = true;
- };
-
programs.ssh.startAgent = false;
security.setuidPrograms = [ "slock" ];