4 files changed, 33 insertions, 13 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 963d07744..98f3ecd22 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -7,24 +7,38 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+      # Base
       ../2configs/base.nix
-      ../2configs/cgit-retiolum.nix
-      # ../2configs/graphite-standalone.nix
-      ../2configs/vm-single-partition.nix
       ../2configs/tinc-basic-retiolum.nix
 
+      # HW/FS
+      <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+      ../2configs/fs/vm-single-partition.nix
+
+      # Services
+      ../2configs/git/cgit-retiolum.nix
+
+      ## Reaktor
+      ## \/ are only plugins, must enable Reaktor explicitly
+      ../2configs/Reaktor/stockholmLentil.nix
+      ../2configs/Reaktor/simpleExtend.nix
+
       ../2configs/exim-retiolum.nix
       ../2configs/urlwatch.nix
+
+      # ../2configs/graphite-standalone.nix
     ];
+  krebs.Reaktor.enable = true;
+
   krebs.build.host = config.krebs.hosts.pnp;
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@pnp";
 
+
   krebs.build.deps = {
     nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
-      rev = "13576925552b1d0751498fdda22e91a055a1ff6c";
+      rev = "03921972268934d900cc32dad253ff383926771c";
     };
   };
 
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 415c1af30..4dcfe4eca 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -13,9 +13,7 @@
       ../2configs/tinc-basic-retiolum.nix
       #../2configs/disable_v6.nix
 
-      #../2configs/sda-crypto-root.nix
-      ../2configs/sda-crypto-root-home.nix
-
+      # environment
       ../2configs/zsh-user.nix
 
       # applications
@@ -23,14 +21,22 @@
       ../2configs/virtualization.nix
       ../2configs/wwan.nix
 
+      # services
+      ../2configs/git/brain-retiolum.nix
+      # ../2configs/Reaktor/simpleExtend.nix
+
       # hardware specifics are in here
-      ../2configs/tp-x220.nix
+      ../2configs/hw/tp-x220.nix
+      # mount points
+      ../2configs/fs/sda-crypto-root-home.nix
     ];
 
   krebs.build.host = config.krebs.hosts.pornocauster;
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@pornocauster";
 
+  #krebs.Reaktor.nickname = "makefu|r";
+
   networking.firewall.allowedTCPPorts = [
     25
   ];
@@ -39,7 +45,7 @@
     nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
       #url = https://github.com/makefu/nixpkgs;
-      rev = "13576925552b1d0751498fdda22e91a055a1ff6c";
+      rev = "03921972268934d900cc32dad253ff383926771c";
     };
   };
 }
diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix
index 503fe8f65..d98ff17c1 100644
--- a/makefu/1systems/repunit.nix
+++ b/makefu/1systems/repunit.nix
@@ -49,7 +49,7 @@
   };
   krebs.retiolum = {
     enable = true;
-    hosts = ../../Zhosts;
+    hosts = ../../krebs/Zhosts;
     connectTo = [
       "gum"
       "pigstarter"
diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 67db22460..3c2bb2eda 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -9,9 +9,9 @@
       ../2configs/base.nix
       ../2configs/base-gui.nix
       ../2configs/tinc-basic-retiolum.nix
-      ../2configs/sda-crypto-root.nix
+      ../2configs/fs/sda-crypto-root.nix
       # hardware specifics are in here
-      ../2configs/tp-x200.nix #< imports tp-x2x0.nix
+      ../2configs/hw/tp-x200.nix #< imports tp-x2x0.nix
 
       ../2configs/disable_v6.nix
       ../2configs/rad1o.nix