From 72335ce00ec759e5b9d7a1468fe517e66948d8ed Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 8 Jun 2016 18:22:15 +0200
Subject: l 1 prism: serve nix-cache

---
 lass/1systems/prism.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 6ed80ac3..9a9bd473 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -210,6 +210,30 @@ in {
         '')
       ];
     }
+    {
+      services.nix-serve = {
+        enable = true;
+        secretKeyFile = config.krebs.secret.files.nix-serve-key.path;
+      };
+      systemd.services.nix-serve = {
+        requires = ["secret.service"];
+        after = ["secret.service"];
+      };
+      krebs.secret.files.nix-serve-key = {
+        path = "/run/secret/nix-serve.key";
+        owner.name = "nix-serve";
+        source-path = toString <secrets> + "/nix-serve.key";
+      };
+      krebs.nginx = {
+        enable = true;
+        servers.nix-serve = {
+          server-names = [ "cache.prism.r" ];
+          locations = lib.singleton (lib.nameValuePair "/" ''
+            proxy_pass http://localhost:${toString config.services.nix-serve.port};
+          '');
+        };
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
-- 
cgit v1.2.3


From dd1c0e7a587a2580ddb0ca4fd318324bcb21e214 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 24 Jun 2016 15:35:47 +0200
Subject: l 1 prism: activate repo-sync

---
 lass/1systems/prism.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 9a9bd473..d4207d2e 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -19,6 +19,7 @@ in {
     ../2configs/privoxy-retiolum.nix
     ../2configs/radio.nix
     ../2configs/buildbot-standalone.nix
+    ../2configs/repo-sync.nix
     {
       imports = [
         ../2configs/git.nix
-- 
cgit v1.2.3


From 2b74d0defdc3c97ffa5e1f18a5e86637f208d7cb Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 25 Jun 2016 18:38:30 +0200
Subject: l: cleanup

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

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index d4207d2e..34c1ef69 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -203,7 +203,7 @@ in {
     }
     {
       imports = [
-        ../2configs/realwallpaper-server.nix
+        ../2configs/realwallpaper.nix
       ];
       krebs.nginx.servers."lassul.us".locations = [
         (lib.nameValuePair "/wallpaper.png" ''
-- 
cgit v1.2.3


From f6d5a9716f8a9dbefbeae19e43b5324f90cb543b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 25 Jun 2016 18:56:39 +0200
Subject: l: move binary-cache config to 2

---
 lass/1systems/prism.nix | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 34c1ef69..8dfc11f6 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -20,6 +20,7 @@ in {
     ../2configs/radio.nix
     ../2configs/buildbot-standalone.nix
     ../2configs/repo-sync.nix
+    ../2configs/binary-cache/server.nix
     {
       imports = [
         ../2configs/git.nix
@@ -211,30 +212,6 @@ in {
         '')
       ];
     }
-    {
-      services.nix-serve = {
-        enable = true;
-        secretKeyFile = config.krebs.secret.files.nix-serve-key.path;
-      };
-      systemd.services.nix-serve = {
-        requires = ["secret.service"];
-        after = ["secret.service"];
-      };
-      krebs.secret.files.nix-serve-key = {
-        path = "/run/secret/nix-serve.key";
-        owner.name = "nix-serve";
-        source-path = toString <secrets> + "/nix-serve.key";
-      };
-      krebs.nginx = {
-        enable = true;
-        servers.nix-serve = {
-          server-names = [ "cache.prism.r" ];
-          locations = lib.singleton (lib.nameValuePair "/" ''
-            proxy_pass http://localhost:${toString config.services.nix-serve.port};
-          '');
-        };
-      };
-    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
-- 
cgit v1.2.3


From 1012224e6707324ba075092017a0c2a9421ddfa7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 28 Jun 2016 17:24:36 +0200
Subject: little bit of code cleanup

---
 lass/1systems/prism.nix | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 8dfc11f6..5477a8b8 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -68,8 +68,6 @@ in {
 
     }
     {
-      #boot.loader.gummiboot.enable = true;
-      #boot.loader.efi.canTouchEfiVariables = true;
       boot.loader.grub = {
         devices = [
           "/dev/sda"
@@ -112,10 +110,6 @@ in {
     {
       sound.enable = false;
     }
-    #{
-    #  #workaround for server dying after 6-7h
-    #  boot.kernelPackages = pkgs.linuxPackages_4_2;
-    #}
     {
       nixpkgs.config.allowUnfree = true;
     }
-- 
cgit v1.2.3