From 3e542873a9bc1a66bd1ed25b0e72c0311f23ac00 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:12:39 +0100
Subject: l 2 browsers: allow audio in flash browser

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

(limited to 'lass/2configs')

diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 61016fed0..eb764068b 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -58,7 +58,7 @@ in {
     ( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] )
     ( createChromiumUser "fb" [ ] [ pkgs.chromium ] )
     ( createChromiumUser "gm" [ ] [ pkgs.chromium ] )
-    ( createChromiumUser "flash" [ ] [ pkgs.flash ] )
+    ( createChromiumUser "flash" [ "audio" ] [ pkgs.flash ] )
   ];
 
   nixpkgs.config.packageOverrides = pkgs : {
-- 
cgit v1.2.3


From 168e8baaf0fc7c9318e60cfd5d0b4a9d507c8c72 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:13:40 +0100
Subject: l 2 git: add extraction_webinterface repo

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

(limited to 'lass/2configs')

diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 76b897d1f..bd4ce3ec2 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -42,6 +42,7 @@ let
       brain = {
         collaborators = with config.krebs.users; [ tv makefu ];
       };
+      extraction_webinterface = {};
     } //
     import <secrets/repos.nix> { inherit config lib pkgs; }
   );
-- 
cgit v1.2.3


From 179ce6c3f9eff376da6bb93feffbb11a52e5d33b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:13:54 +0100
Subject: l 2 git: add politics-fetching repo

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

(limited to 'lass/2configs')

diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index bd4ce3ec2..0aab298c7 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -43,6 +43,7 @@ let
         collaborators = with config.krebs.users; [ tv makefu ];
       };
       extraction_webinterface = {};
+      politics-fetching = {};
     } //
     import <secrets/repos.nix> { inherit config lib pkgs; }
   );
-- 
cgit v1.2.3


From 81fa056af7446a461d24b538c225605589d15cef Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:14:27 +0100
Subject: l 2 xserver: add systemPackages PATH

---
 lass/2configs/xserver/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 82cfd57bb..203ed0b09 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -93,11 +93,9 @@ let
   xmonad-start = pkgs.writeScriptBin "xmonad" ''
     #! ${pkgs.bash}/bin/bash
     set -efu
-    export PATH; PATH=${makeSearchPath "bin" [
-      pkgs.alsaUtils
-      pkgs.pulseaudioLight
+    export PATH; PATH=${makeSearchPath "bin" ([
       pkgs.rxvt_unicode
-    ]}:/var/setuid-wrappers
+    ] ++ config.environment.systemPackages)}:/var/setuid-wrappers
     settle() {(
       # Use PATH for a clean journal
       command=''${1##*/}
-- 
cgit v1.2.3


From 9d519dd4d28d05f0fb86f742fedaa6a505522a4b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 15:00:18 +0100
Subject: l 2: use inherit genid from krebs.lib

---
 lass/2configs/libvirt.nix | 3 ++-
 lass/2configs/skype.nix   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/libvirt.nix b/lass/2configs/libvirt.nix
index 7520a0e36..a51ccae58 100644
--- a/lass/2configs/libvirt.nix
+++ b/lass/2configs/libvirt.nix
@@ -2,13 +2,14 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
+  inherit (config.krebs.lib) genid;
 
 in {
   virtualisation.libvirtd.enable = true;
 
   users.extraUsers = {
     libvirt = {
-      uid = lib.genid "libvirt";
+      uid = genid "libvirt";
       description = "user for running libvirt stuff";
       home = "/home/libvirt";
       useDefaultShell = true;
diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix
index d62a18a52..5b6da4a95 100644
--- a/lass/2configs/skype.nix
+++ b/lass/2configs/skype.nix
@@ -2,12 +2,13 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
+  inherit (config.krebs.lib) genid;
 
 in {
   users.extraUsers = {
     skype = {
       name = "skype";
-      uid = lib.genid "skype";
+      uid = genid "skype";
       description = "user for running skype";
       home = "/home/skype";
       useDefaultShell = true;
-- 
cgit v1.2.3