From 1d4f2bf01131d90e370bb8da2d5023aeaacf0b1d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 19 Oct 2015 14:00:15 +0200
Subject: l: move more config to base.nix

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index f313054d9..2e42f86ae 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -38,14 +38,28 @@ with lib;
     }
   ];
 
+  networking.hostName = config.krebs.build.host.name;
+  nix.maxJobs = config.krebs.build.host.cores;
+
   krebs = {
     enable = true;
     search-domain = "retiolum";
     exim-retiolum.enable = true;
-    build.source = {
-      git.nixpkgs = {
-        url = https://github.com/Lassulus/nixpkgs;
-        rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da";
+    build = {
+      user = config.krebs.users.lass;
+      source = {
+        git.nixpkgs = {
+          url = https://github.com/Lassulus/nixpkgs;
+          rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da";
+        };
+        dir.secrets = {
+          host = config.krebs.hosts.mors;
+          path = "/home/lass/secrets/${config.krebs.build.host.name}";
+        };
+        dir.stockholm = {
+          host = config.krebs.hosts.mors;
+          path = "/home/lass/stockholm";
+        };
       };
     };
   };
-- 
cgit v1.2.3


From 517e6e00097f4f9ebb1f7bd784d2bb44dce5f4b8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 19 Oct 2015 14:03:08 +0200
Subject: l 2 base: remove old code

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 2e42f86ae..902fcb70b 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -137,12 +137,6 @@ with lib;
     "sendmail"
   ];
 
-  #services.gitolite = {
-  #  enable = true;
-  #  dataDir = "/home/gitolite";
-  #  adminPubkey = config.sshKeys.lass.pub;
-  #};
-
   services.openssh = {
     enable = true;
     hostKeys = [
-- 
cgit v1.2.3


From 8144b59c5786459619b4a06ecc150b6a96af014b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 21 Oct 2015 01:34:05 +0200
Subject: l 2 base: nixpkgs b9270a2 -> 33bdc01

---
 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 902fcb70b..52501441a 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 = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da";
+          rev = "33bdc011f5360288cd10b9fda90da2950442b2ab";
         };
         dir.secrets = {
           host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From 8f7253184ac53792d125c6713b0757da58389b1e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 21 Oct 2015 01:34:27 +0200
Subject: l 2 base: add aria2 to base install

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

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 52501441a..6fa9c5b2d 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -96,6 +96,9 @@ with lib;
 
   #network
     iptables
+
+  #stuff for dl
+    aria2
   ];
 
   programs.bash = {
-- 
cgit v1.2.3