From d6d9956abc60548c755d30e6a5bd13c10abbb181 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 4 Sep 2015 23:06:43 +0200
Subject: makefu/pnp: uses new Reaktor infrastructure

---
 makefu/1systems/pnp.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 6ca1f110..98f3ecd2 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -7,21 +7,33 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+      # Base
       ../2configs/base.nix
-      ../2configs/git/cgit-retiolum.nix
-      # ../2configs/graphite-standalone.nix
-      ../2configs/fs/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.Reaktor.enable = true;
 
   krebs.build.deps = {
     nixpkgs = {
-- 
cgit v1.2.3