diff options
| author | lassulus <lass@aidsballs.de> | 2016-03-15 14:14:29 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-03-15 14:14:29 +0100 |
| commit | 72939a2d6f45950dbfa6ec0815eae62e83d02630 (patch) | |
| tree | d35ae568feeb1d1110be316ba8d434308e0aa780 /makefu/1systems/filepimp.nix | |
| parent | db3dd77f6de5964bcaa265bf8e5863d7647932f5 (diff) | |
| parent | 2e317bfe747ec968d3b933ae4c0df68ad204021c (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/filepimp.nix')
| -rw-r--r-- | makefu/1systems/filepimp.nix | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/makefu/1systems/filepimp.nix b/makefu/1systems/filepimp.nix index f2c592ea9..593f77378 100644 --- a/makefu/1systems/filepimp.nix +++ b/makefu/1systems/filepimp.nix @@ -3,19 +3,27 @@ let byid = dev: "/dev/disk/by-id/" + dev; part1 = disk: disk + "-part1"; rootDisk = byid "ata-SanDisk_SDSSDP064G_140237402890"; - jDisk0 = byid "ata-ST4000DM000-1F2168_Z303HVSG"; + # N54L Chassis: + # ____________________ + # |______FRONT_______| + # | [ ]| + # | [ d1 ** d3 d4 ]| + # |___[_____________]| jDisk1 = byid "ata-ST4000DM000-1F2168_Z3040NEA"; + + # transfer to omo + # jDisk0 = byid "ata-ST4000DM000-1F2168_Z303HVSG"; jDisk2 = byid "ata-WDC_WD40EFRX-68WT0N0_WD-WCC4E0621363"; jDisk3 = byid "ata-TOSHIBA_MD04ACA400_156GK89OFSBA"; - allDisks = [ rootDisk jDisk0 jDisk1 jDisk2 jDisk3 ]; + allDisks = [ rootDisk jDisk1 jDisk2 jDisk3 ]; in { imports = [ # Include the results of the hardware scan. ../. ../2configs/fs/single-partition-ext4.nix - ../2configs/tinc-basic-retiolum.nix ../2configs/smart-monitor.nix ]; + krebs.retiolum.enable = true; krebs.build.host = config.krebs.hosts.filepimp; # AMD N54L boot = { @@ -44,7 +52,11 @@ in { in { enable = true; # todo combine creation when enabling the mount point - disks = map toMedia [ "j0" "j1" "j2" ]; + disks = map toMedia [ + # "j0" + "j1" + "j2" + ]; parity = toMedia "par0"; }; # TODO: refactor, copy-paste from omo @@ -58,8 +70,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 "par0" (part1 jDisk3)); + # (xfsmount "j0" (part1 jDisk0)) // + (xfsmount "j1" (part1 jDisk1)) // + (xfsmount "j2" (part1 jDisk2)) // + (xfsmount "par0" (part1 jDisk3)) + ; } |