Merge remote-tracking branch 'prism/master'

3 files changed, 26 insertions, 2 deletions

diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
new file mode 100644
index 000000000..0630d19ad
--- /dev/null
+++ b/makefu/1systems/cake/config.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+{
+    imports = [
+        <stockholm/makefu>
+        # configure your hw:
+        # <stockholm/makefu/2configs/hw/CAC.nix>
+        # <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
+        # <stockholm/makefu/2configs/save-diskspace.nix
+    ];
+    krebs = {
+        enable = true;
+        tinc.retiolum.enable = true;
+        build.host = config.krebs.hosts.cake;
+    };
+    # You want to change these :)
+    boot.loader.grub.device = "/dev/sda";
+    fileSystems."/" = {
+        device = "/dev/sda1";
+    };
+}
\ No newline at end of file
diff --git a/makefu/1systems/cake/source.nix b/makefu/1systems/cake/source.nix
new file mode 100644
index 000000000..797417a1d
--- /dev/null
+++ b/makefu/1systems/cake/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="cake";
+}
\ No newline at end of file
diff --git a/makefu/1systems/pnp/config.nix b/makefu/1systems/pnp/config.nix
index 5fbaaabc7..6c9fc0606 100644
--- a/makefu/1systems/pnp/config.nix
+++ b/makefu/1systems/pnp/config.nix
@@ -34,10 +34,11 @@
   krebs.Reaktor.debug = {
     debug = true;
     extraEnviron = {
-      REAKTOR_HOST = "ni.r";
+      # TODO: remove hard-coded server
+      REAKTOR_HOST = "irc.r";
     };
     plugins = with pkgs.ReaktorPlugins; [ stockholm-issue nixos-version sed-plugin ];
-    channels = [ "#retiolum" ];
+    channels = [ "#xxx" ];
   };
 
   krebs.build.host = config.krebs.hosts.pnp;