From beca36faf241f610b05379295801a102c696273d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 23 Oct 2015 16:37:25 +0200
Subject: lass 2 base: nixpkgs rev 33bdc01 -> 0da65a5

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 6fa9c5b2d..c4c817ab6 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -50,7 +50,7 @@ with lib;
       source = {
         git.nixpkgs = {
           url = https://github.com/Lassulus/nixpkgs;
-          rev = "33bdc011f5360288cd10b9fda90da2950442b2ab";
+          rev = "0da65a5324b1e25d323f982bb0ef2c7fcab9f057";
         };
         dir.secrets = {
           host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From e6d08eeeb6e7737e8a2594efd579d40525fb21dc Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 24 Oct 2015 16:04:22 +0200
Subject: l 2 base: nixpkgs rev 0da65a5 -> 763ad33

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index c4c817ab6..0685a85dc 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -50,7 +50,7 @@ with lib;
       source = {
         git.nixpkgs = {
           url = https://github.com/Lassulus/nixpkgs;
-          rev = "0da65a5324b1e25d323f982bb0ef2c7fcab9f057";
+          rev = "763ad3372a9719f1187d800edbbb21a82180b143";
         };
         dir.secrets = {
           host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From ace11d79badafce313b17c968701739513e95982 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 25 Oct 2015 21:13:45 +0100
Subject: l 2 base: nixpkgs 763ad33 -> 6d31e9b

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 0685a85dc..fe6aa8361 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -50,7 +50,7 @@ with lib;
       source = {
         git.nixpkgs = {
           url = https://github.com/Lassulus/nixpkgs;
-          rev = "763ad3372a9719f1187d800edbbb21a82180b143";
+          rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80";
         };
         dir.secrets = {
           host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From db889e085d8b4b15cab83116562085ab27bc0acb Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 30 Oct 2015 18:35:21 +0100
Subject: lass 2 base*: reorganize groups

---
 lass/2configs/base.nix | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index fe6aa8361..057af7bc4 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -27,8 +27,6 @@ with lib;
           createHome = true;
           useDefaultShell = true;
           extraGroups = [
-            "audio"
-            "wheel"
           ];
           openssh.authorizedKeys.keys = map readFile [
             ../../krebs/Zpubkeys/lass.ssh.pub
-- 
cgit v1.2.3


From 10fc9eb4ee5151bee86026cd81a73d333551b612 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 31 Oct 2015 15:09:43 +0100
Subject: l 2: get ssh-keys via api

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 057af7bc4..11bc4f089 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -15,8 +15,8 @@ with lib;
     {
       users.extraUsers = {
         root = {
-          openssh.authorizedKeys.keys = map readFile [
-            ../../krebs/Zpubkeys/lass.ssh.pub
+          openssh.authorizedKeys.keys = [
+            config.krebs.users.lass.pubkey
           ];
         };
         mainUser = {
@@ -28,8 +28,8 @@ with lib;
           useDefaultShell = true;
           extraGroups = [
           ];
-          openssh.authorizedKeys.keys = map readFile [
-            ../../krebs/Zpubkeys/lass.ssh.pub
+          openssh.authorizedKeys.keys = [
+            config.krebs.users.lass.pubkey
           ];
         };
       };
-- 
cgit v1.2.3