8 files changed, 32 insertions, 9 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;
diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix
index 05754dc7f..3be3fccef 100644
--- a/makefu/2configs/git/brain-retiolum.nix
+++ b/makefu/2configs/git/brain-retiolum.nix
@@ -19,9 +19,9 @@ let
       post-receive = pkgs.git-hooks.irc-announce {
         nick = config.networking.hostName;
         verbose = true;
-        channel = "#retiolum";
+        channel = "#xxx";
         # TODO remove the hardcoded hostname
-        server = "ni.r";
+        server = "irc.r";
       };
     };
   };
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 5604383e7..ed890fe40 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -57,9 +57,9 @@ let
       post-receive = pkgs.git-hooks.irc-announce {
         nick = config.networking.hostName;
         verbose = config.krebs.build.host.name == "gum";
-        channel = "#retiolum";
+        channel = "#xxx";
         # TODO remove the hardcoded hostname
-        server = "ni.r";
+        server = "irc.r";
       };
     };
   };
diff --git a/makefu/2configs/stats/server.nix b/makefu/2configs/stats/server.nix
index bb91b4478..7548c733e 100644
--- a/makefu/2configs/stats/server.nix
+++ b/makefu/2configs/stats/server.nix
@@ -2,7 +2,7 @@
 
 with import <stockholm/lib>;
 let
-  irc-server = "ni.r";
+  irc-server = "rc.r";
   irc-nick = "m-alarm";
   collectd-port = 25826;
   influx-port = 8086;
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 0538647ae..2f80b08c9 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -13,7 +13,6 @@
     keepassx
     pcmanfm
     evince
-    skype
     mirage
     tightvnc
     gnome3.dconf
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index b2d616764..bcc068d82 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -6,7 +6,7 @@
     gimp
     inkscape
     libreoffice
-    skype
+    # skype
     synergy
     tdesktop
     virtmanager