diff options
| author | makefu <github@syntax-fehler.de> | 2017-07-15 19:01:02 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-07-15 22:29:14 +0200 |
| commit | b2071110099ca42ce8d3497db0d024fb8aa03e8a (patch) | |
| tree | 9b1bb5816518fc9ad88e393146d9522d5cff9e8f /1systems/filepimp | |
| parent | 8ffce1c9f4831de11b6718626f0df11c206fa5e8 (diff) | |
ma: replace path to 2configs, init source.nix
Diffstat (limited to '1systems/filepimp')
| -rw-r--r-- | 1systems/filepimp/config.nix | 16 | ||||
| -rw-r--r-- | 1systems/filepimp/source.nix | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/1systems/filepimp/config.nix b/1systems/filepimp/config.nix index e143d0046..65e81af66 100644 --- a/1systems/filepimp/config.nix +++ b/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/1systems/filepimp/source.nix b/1systems/filepimp/source.nix new file mode 100644 index 000000000..88c9f4f08 --- /dev/null +++ b/1systems/filepimp/source.nix @@ -0,0 +1,3 @@ +import <stockholm/makefu/source.nix> { + name="filepimp"; +} |