From 9273a32fee20c3f8607d190aea341251de5f5364 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 28 Nov 2017 17:55:25 +0100
Subject: hotdog.r: remove krebs reaktor

---
 krebs/1systems/hotdog/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 4fdb53ae7..73b5377bd 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -13,7 +13,6 @@
     <stockholm/krebs/2configs/gitlab-runner-shackspace.nix>
     <stockholm/krebs/2configs/binary-cache/nixos.nix>
     <stockholm/krebs/2configs/ircd.nix>
-    <stockholm/krebs/2configs/reaktor-krebs.nix>
     <stockholm/krebs/2configs/reaktor-retiolum.nix>
   ];
 
-- 
cgit v1.2.3


From 5014ba291dce70a8b4ffb36ddc0d9cd3a45aa6e4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 28 Nov 2017 19:40:03 +0100
Subject: types: use cidr only in tinc.subnets

---
 krebs/3modules/lass/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 867f1bd34..d2c3000d6 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -449,8 +449,6 @@ with import <stockholm/lib>;
         retiolum = rec {
           via = internet;
           addrs = [
-            # edinburgh university
-            "129.215.0.0/16"
             ip4.addr
             ip6.addr
           ];
@@ -472,6 +470,10 @@ with import <stockholm/lib>;
             lyK301Jb42wGEsVWxu3Eo/PLtp8OdD+Wdh6o/ELcc0k/YCUGFMujUM8CAwEAAQ==
             -----END RSA PUBLIC KEY-----
           '';
+          tinc.subnets = [
+            # edinburgh university
+            "129.215.0.0/16"
+          ];
         };
       };
     };
-- 
cgit v1.2.3


From 3c631cfa76849cb4640e17d8cdda969e4b6f423e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 3 Dec 2017 22:29:18 +0100
Subject: fetchWallpaper: get DISPLAY from xserver.display

---
 krebs/3modules/fetchWallpaper.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix
index 8d4933cb5..58d361c6e 100644
--- a/krebs/3modules/fetchWallpaper.nix
+++ b/krebs/3modules/fetchWallpaper.nix
@@ -26,8 +26,8 @@ let
       default = "/var/lib/wallpaper";
     };
     display = mkOption {
-      type = types.str;
-      default = ":0";
+      type = types.int;
+      default = config.services.xserver.display;
     };
     unitConfig = mkOption {
       type = types.attrsOf types.str;
@@ -81,7 +81,7 @@ let
 
       environment = {
         URL = cfg.url;
-        DISPLAY = cfg.display;
+        DISPLAY = ":${toString cfg.display}";
       };
       restartIfChanged = true;
 
-- 
cgit v1.2.3


From 47e7a6f6880195c41465e92b2d11f060d9e21311 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 3 Dec 2017 23:31:31 +0100
Subject: fetchWallpaper: display should be string

---
 krebs/3modules/fetchWallpaper.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix
index 58d361c6e..f67188122 100644
--- a/krebs/3modules/fetchWallpaper.nix
+++ b/krebs/3modules/fetchWallpaper.nix
@@ -26,8 +26,8 @@ let
       default = "/var/lib/wallpaper";
     };
     display = mkOption {
-      type = types.int;
-      default = config.services.xserver.display;
+      type = types.str;
+      default = ":${toString config.services.xserver.display}";
     };
     unitConfig = mkOption {
       type = types.attrsOf types.str;
@@ -81,7 +81,7 @@ let
 
       environment = {
         URL = cfg.url;
-        DISPLAY = ":${toString cfg.display}";
+        DISPLAY = cfg.display;
       };
       restartIfChanged = true;
 
-- 
cgit v1.2.3


From 054d0cceb132d5f5766de31b3e859c4786fb0661 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Dec 2017 01:01:26 +0100
Subject: ircd: add motd

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

(limited to 'krebs')

diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix
index 38f58952e..b534f9ad4 100644
--- a/krebs/2configs/ircd.nix
+++ b/krebs/2configs/ircd.nix
@@ -7,6 +7,9 @@
 
   services.charybdis = {
     enable = true;
+    motd = ''
+      hello
+    '';
     config = ''
       serverinfo {
         name = "${config.krebs.build.host.name}.irc.retiolum";
-- 
cgit v1.2.3