From a8691101c61969736f227cd54b7c7bbf3514f1a0 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 25 May 2016 16:21:38 +0200
Subject: l 2: use nixos-16.03 with new ts3 server

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

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

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index ee320b9c9..4f03748e6 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -55,8 +55,8 @@ with config.krebs.lib;
         #secrets-common = "/home/lass/secrets/common";
         stockholm = "/home/lass/stockholm";
         nixpkgs = {
-          url = https://github.com/NixOS/nixpkgs;
-          rev = "d541e0dc1c05f5514bf30f8039e687adddb45616";
+          url = https://github.com/lassulus/nixpkgs;
+          rev = "e781dae17e5478426cc97a4ac3e520be2dd0cddd";
           dev = "/home/lass/src/nixpkgs";
         };
       } // optionalAttrs config.krebs.build.host.secure {
-- 
cgit v1.2.3


From afcfa65077f13f2388b44e2445246c0d9b470645 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 1 Jun 2016 00:10:53 +0200
Subject: l 2: add mainUser to fuse for sshfs

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

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

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 4f03748e6..8d488e335 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -30,6 +30,7 @@ with config.krebs.lib;
           createHome = true;
           useDefaultShell = true;
           extraGroups = [
+            "fuse"
           ];
           openssh.authorizedKeys.keys = [
             config.krebs.users.lass.pubkey
-- 
cgit v1.2.3


From a0c1049638b969eb079c9e1ee93c417fba9c9730 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 1 Jun 2016 00:11:15 +0200
Subject: l 2: bump nixpkgs e781dae -> f632f8e

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

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

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 8d488e335..1c06acf38 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -57,7 +57,7 @@ with config.krebs.lib;
         stockholm = "/home/lass/stockholm";
         nixpkgs = {
           url = https://github.com/lassulus/nixpkgs;
-          rev = "e781dae17e5478426cc97a4ac3e520be2dd0cddd";
+          rev = "f632f8edaf80ffa8bf0b8c9b9064cae3ccbe3894";
           dev = "/home/lass/src/nixpkgs";
         };
       } // optionalAttrs config.krebs.build.host.secure {
-- 
cgit v1.2.3