summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/filepimp
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-15 19:01:02 +0200
committermakefu <github@syntax-fehler.de>2017-07-15 22:29:14 +0200
commit7704f80890c75f65c2906ecc17cdd89761d308ad (patch)
treefebe3c92e7eb672767f7162f175b2d94fe51c2e7 /makefu/1systems/filepimp
parentfa38155eec9563dc9dc620a77900d87b97443cfe (diff)
ma: replace path to 2configs, init source.nix
Diffstat (limited to 'makefu/1systems/filepimp')
-rw-r--r--makefu/1systems/filepimp/config.nix16
-rw-r--r--makefu/1systems/filepimp/source.nix3
2 files changed, 11 insertions, 8 deletions
diff --git a/makefu/1systems/filepimp/config.nix b/makefu/1systems/filepimp/config.nix
index e143d0046..65e81af66 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 000000000..88c9f4f08
--- /dev/null
+++ b/makefu/1systems/filepimp/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+ name="filepimp";
+}