From 9eff022e421307723084159cb93b020cff7bc139 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 5 Sep 2015 12:14:16 +0200
Subject: move pubkey imports to krebs/Zpubkeys

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index d44a19c1e..b29d028d9 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -14,7 +14,7 @@ with lib;
       users.extraUsers = {
         root = {
           openssh.authorizedKeys.keys = map readFile [
-            ../../Zpubkeys/lass.ssh.pub
+            ../../krebs/Zpubkeys/lass.ssh.pub
           ];
         };
         mainUser = {
@@ -29,7 +29,7 @@ with lib;
             "wheel"
           ];
           openssh.authorizedKeys.keys = map readFile [
-            ../../Zpubkeys/lass.ssh.pub
+            ../../krebs/Zpubkeys/lass.ssh.pub
           ];
         };
       };
-- 
cgit v1.2.3


From d3af0f72cd2b5fd391bdd70a2a8001d5f9557984 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 13 Sep 2015 16:37:00 +0200
Subject: lass 2 base: bump nixpkgs rev

---
 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 b29d028d9..bd829c641 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -42,7 +42,7 @@ with lib;
     exim-retiolum.enable = true;
     build.deps.nixpkgs = {
       url = https://github.com/Lassulus/nixpkgs;
-      rev = "58a82ff50b8605b88a8f66481d8c85bf8ab53be3";
+      rev = "e74d0e7ff83c16846a81e1173543f180ad565076";
     };
   };
 
-- 
cgit v1.2.3


From e863eae0eadf2b57076121264d7798177640a194 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 13 Sep 2015 16:37:11 +0200
Subject: lass 2 base: dont get a ipv4ll address

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index bd829c641..18acd15ab 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -147,4 +147,8 @@ with lib;
     };
   };
 
+  networking.dhcpcd.extraConfig = ''
+    noipv4ll
+  '';
+
 }
-- 
cgit v1.2.3


From db75ef768b705fc6c4cbbd5ed29f817470c9952d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 19 Sep 2015 23:40:51 +0200
Subject: lass 2: use zsh as defaultShell

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 18acd15ab..6774845c0 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -5,6 +5,7 @@ with lib;
   imports = [
     ../3modules/iptables.nix
     ../2configs/vim.nix
+    ../2configs/zsh.nix
     {
       users.extraUsers =
         mapAttrs (_: h: { hashedPassword = h; })
-- 
cgit v1.2.3