From 1d47f59e8f446f0c9e774114138e9881e6f85742 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 18 Jun 2016 13:28:15 +0200
Subject: l 2: use pulse.nix

---
 lass/2configs/baseX.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'lass/2configs/baseX.nix')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 7e969b3e..7431617c 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -8,6 +8,7 @@ in {
     #./urxvt.nix
     ./xserver
     ./mpv.nix
+    ./pulse.nix
   ];
 
   users.extraUsers.mainUser.extraGroups = [ "audio" ];
@@ -16,11 +17,6 @@ in {
 
   virtualisation.libvirtd.enable = true;
 
-  hardware.pulseaudio = {
-    enable = true;
-    systemWide = true;
-  };
-
   programs.ssh.startAgent = false;
 
   security.setuidPrograms = [ "slock" ];
-- 
cgit v1.2.3


From d2120732b7643f1dd8770b4e7f75ee6b9c991cca Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 18 Jun 2016 22:01:10 +0200
Subject: l 2 baseX: import power-action.nix

---
 lass/2configs/baseX.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/2configs/baseX.nix')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 7431617c..744e8ed9 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -9,6 +9,7 @@ in {
     ./xserver
     ./mpv.nix
     ./pulse.nix
+    ./power-action.nix
   ];
 
   users.extraUsers.mainUser.extraGroups = [ "audio" ];
-- 
cgit v1.2.3


From 914dabb84885df8162a49baba682c46ddba4c3d8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 19 Jun 2016 17:25:55 +0200
Subject: l 2 baseX: use hardware.pulseaudio again

steam sound was broken
---
 lass/2configs/baseX.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lass/2configs/baseX.nix')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 744e8ed9..6d26ff89 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -8,9 +8,13 @@ in {
     #./urxvt.nix
     ./xserver
     ./mpv.nix
-    ./pulse.nix
+    #./pulse.nix
     ./power-action.nix
   ];
+  hardware.pulseaudio = {
+    enable = true;
+    systemWide = true;
+  };
 
   users.extraUsers.mainUser.extraGroups = [ "audio" ];
 
-- 
cgit v1.2.3