From 7704f80890c75f65c2906ecc17cdd89761d308ad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 15 Jul 2017 19:01:02 +0200
Subject: ma: replace path to 2configs, init source.nix

---
 makefu/1systems/filepimp/config.nix | 16 ++++++++--------
 makefu/1systems/filepimp/source.nix |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 makefu/1systems/filepimp/source.nix

(limited to 'makefu/1systems/filepimp')

diff --git a/makefu/1systems/filepimp/config.nix b/makefu/1systems/filepimp/config.nix
index e143d004..65e81af6 100644
--- a/makefu/1systems/filepimp/config.nix
+++ b/makefu/1systems/filepimp/config.nix
@@ -20,11 +20,11 @@ let
 in {
   imports =
     [ # Include the results of the hardware scan.
-      ../.
-      ../2configs/fs/single-partition-ext4.nix
-      ../2configs/smart-monitor.nix
-      ../2configs/tinc/retiolum.nix
-      ../2configs/filepimp-share.nix
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+      <stockholm/makefu/2configs/smart-monitor.nix>
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+      <stockholm/makefu/2configs/filepimp-share.nix>
     ];
 
   krebs.build.host = config.krebs.hosts.filepimp;
@@ -73,9 +73,9 @@ in {
     xfsmount = name: dev:
       { "/media/${name}" = { device = dev; fsType = "xfs"; }; };
   in
-  # (xfsmount "j0" (part1 jDisk0))   //
-    (xfsmount "j1" (part1 jDisk1))   //
-    (xfsmount "j2" (part1 jDisk2))   //
+  # (xfsmount "j0" (part1 jDisk0)) <stockholm/makefu>
+    (xfsmount "j1" (part1 jDisk1)) <stockholm/makefu>
+    (xfsmount "j2" (part1 jDisk2)) <stockholm/makefu>
     (xfsmount "par0" (part1 jDisk3))
     ;
 
diff --git a/makefu/1systems/filepimp/source.nix b/makefu/1systems/filepimp/source.nix
new file mode 100644
index 00000000..88c9f4f0
--- /dev/null
+++ b/makefu/1systems/filepimp/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="filepimp";
+}
-- 
cgit v1.2.3