diff --git a/systems/nasty/drives.nix b/systems/nasty/drives.nix index 36f593b..bce6c9d 100644 --- a/systems/nasty/drives.nix +++ b/systems/nasty/drives.nix @@ -1,20 +1,25 @@ { ... }: +let + btrfsOpt = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=10m" ]; +in { environment.etc.crypttab = { text = '' - 1EJZN6MZ UUID=8264b529-17a9-4167-8e34-3774b5074a4e /var/lib/keyfiles/8264b529-17a9-4167-8e34-3774b5074a4e nofail - 1EKR513Z UUID=80483157-7aa4-42a4-af5d-bbd7474a29b3 /var/lib/keyfiles/80483157-7aa4-42a4-af5d-bbd7474a29b3 nofail - 1EKVK21Z UUID=438e7e6b-4faa-4fc5-b7ba-3d7af0c9e184 /var/lib/keyfiles/438e7e6b-4faa-4fc5-b7ba-3d7af0c9e184 nofail + 1EJZN6MZ UUID=da1abbcf-69ef-4bbf-847f-5df0c2a321f9 /var/lib/keyfiles/da1abbcf-69ef-4bbf-847f-5df0c2a321f9 nofail + 1EKR513Z UUID=9dfd833d-b79f-478b-9c07-e6730f88b02f /var/lib/keyfiles/9dfd833d-b79f-478b-9c07-e6730f88b02f nofail + 1EKVK21Z UUID=7d1b1146-a50e-405e-8d3e-df0d1fbc9451 /var/lib/keyfiles/7d1b1146-a50e-405e-8d3e-df0d1fbc9451 nofail 43P0A00AFJDH UUID=eff697b4-86bc-4a0e-833f-cc40e6aa001e /var/lib/keyfiles/eff697b4-86bc-4a0e-833f-cc40e6aa001e nofail - 43P0A00FFJDH UUID=eae95261-2600-4935-93ba-6cd8e54773e0 /var/lib/keyfiles/eae95261-2600-4935-93ba-6cd8e54773e0 nofail - 53F0A0SBFJDH UUID=f443a535-ca5a-4093-9f29-6ab0699e3527 /var/lib/keyfiles/f443a535-ca5a-4093-9f29-6ab0699e3527 nofail - 53G0A2AXFJDH UUID=2fc7874c-ef0e-41d7-85f6-a8364041c51b /var/lib/keyfiles/2fc7874c-ef0e-41d7-85f6-a8364041c51b nofail + 43P0A00FFJDH UUID=69dc9bb1-f180-43f1-9f98-48ca592278bf /var/lib/keyfiles/69dc9bb1-f180-43f1-9f98-48ca592278bf nofail + 53F0A0SBFJDH UUID=d228e44f-fe1f-4eee-8415-289583ddec99 /var/lib/keyfiles/d228e44f-fe1f-4eee-8415-289583ddec99 nofail + 53G0A2AXFJDH UUID=dd66940c-aa6e-460a-9e55-7dd08247a792 /var/lib/keyfiles/dd66940c-aa6e-460a-9e55-7dd08247a792 nofail 53J0A016FJDH UUID=95f84b21-d3d3-4241-8a9b-5ac46afea1e1 /var/lib/keyfiles/95f84b21-d3d3-4241-8a9b-5ac46afea1e1 nofail - 92F0A079FJDH UUID=b915263e-082d-4954-845d-4bdf4fbf049a /var/lib/keyfiles/b915263e-082d-4954-845d-4bdf4fbf049a nofail - X2N0A0AXFJDH UUID=60e3e109-d7e0-4587-ba08-ba69eb6cd957 /var/lib/keyfiles/60e3e109-d7e0-4587-ba08-ba69eb6cd957 nofail - X2N0A0AZFJDH UUID=d57c6d8f-26cd-4387-8aaa-37dcedb1eadf /var/lib/keyfiles/d57c6d8f-26cd-4387-8aaa-37dcedb1eadf nofail - ZA1D9307 UUID=4d4621d3-0b75-4779-8548-a4836e68469e /var/lib/keyfiles/4d4621d3-0b75-4779-8548-a4836e68469e nofail + 92F0A079FJDH UUID=9af505c3-69cc-4954-93fd-fe625a882b28 /var/lib/keyfiles/9af505c3-69cc-4954-93fd-fe625a882b28 nofail + X2N0A0AXFJDH UUID=7b46d2e3-09da-4ef6-987f-6ffcabf79537 /var/lib/keyfiles/7b46d2e3-09da-4ef6-987f-6ffcabf79537 nofail + X2N0A0AZFJDH UUID=db05ac12-2a2b-4baf-8bf0-94a3e5c9ba9e /var/lib/keyfiles/db05ac12-2a2b-4baf-8bf0-94a3e5c9ba9e nofail + ZA1D9307 UUID=79f2d993-6862-4f9c-ba2d-88f49286e356 /var/lib/keyfiles/79f2d993-6862-4f9c-ba2d-88f49286e356 nofail + ZVV0688G UUID=8a14aa76-5138-4cd0-8f31-0aafe63e870b /var/lib/keyfiles/8a14aa76-5138-4cd0-8f31-0aafe63e870b nofail + ZVV072JR UUID=416f1016-b849-4bc8-a078-4b1426788c6c /var/lib/keyfiles/416f1016-b849-4bc8-a078-4b1426788c6c nofail ''; #unused }; @@ -23,7 +28,6 @@ "/" = { device = "/dev/disk/by-uuid/ad716602-9e0d-4c07-9fb5-e15cb6df3004"; fsType = "ext4"; - #options = [ "compress-force=zstd" ]; }; "/boot/efi" = { @@ -35,80 +39,92 @@ "/mnt/drives/1EJZN6MZ" = { label = "1EJZN6MZ"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/1EKR513Z" = { label = "1EKR513Z"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/1EKVK21Z" = { label = "1EKVK21Z"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/53F0A0SBFJDH" = { label = "53F0A0SBFJDH"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/53G0A2AXFJDH" = { label = "53G0A2AXFJDH"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/53J0A016FJDH" = { label = "53J0A016FJDH"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/92F0A079FJDH" = { label = "92F0A079FJDH"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/43P0A00FFJDH" = { label = "43P0A00FFJDH"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/43P0A00AFJDH" = { label = "43P0A00AFJDH"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/X2N0A0AXFJDH" = { label = "X2N0A0AXFJDH"; - fsType = "ext4"; - options = [ "nofail" "x-systemd.mount-timeout=5m" ]; + fsType = "btrfs"; + options = btrfsOpt; }; "/mnt/drives/X2N0A0AZFJDH" = { label = "X2N0A0AZFJDH"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; }; "/mnt/drives/ZA1D9307" = { label = "ZA1D9307"; fsType = "btrfs"; - options = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=5m" ]; + options = btrfsOpt; + }; + + "/mnt/drives/ZVV0688G" = { + label = "ZVV0688G"; + fsType = "btrfs"; + options = btrfsOpt; + }; + + "/mnt/drives/ZVV072JR" = { + label = "ZVV072JR"; + fsType = "btrfs"; + options = btrfsOpt; }; "/mnt/mergerfs" = { - device = "/mnt/drives/X2N0A0AXFJDH:/mnt/drives/92F0A079FJDH:/mnt/drives/43P0A00FFJDH:/mnt/drives/43P0A00AFJDH:/mnt/drives/53J0A016FJDH:/mnt/drives/53F0A0SBFJDH:/mnt/drives/53G0A2AXFJDH:/mnt/drives/1EKVK21Z:/mnt/drives/1EJZN6MZ:/mnt/drives/1EKR513Z"; + device = "/mnt/drives/ZVV0688G:/mnt/drives/ZVV072JR:/mnt/drives/53F0A0SBFJDH:/mnt/drives/X2N0A0AZFJDH:/mnt/drives/53G0A2AXFJDH:/mnt/drives/92F0A079FJDH:/mnt/drives/X2N0A0AXFJDH:/mnt/drives/43P0A00FFJDH:/mnt/drives/ZA1D9307:/mnt/drives/1EJZN6MZ:/mnt/drives/1EKR513Z:/mnt/drives/1EKVK21Z"; fsType = "fuse.mergerfs"; options = [ "cache.files=full,,dropcacheonclose=true,category.create=mfs" "nofail" ]; - depends = [ "/mnt/drives/X2N0A0AXFJDH" "/mnt/drives/92F0A079FJDH" "/mnt/drives/43P0A00FFJDH" "/mnt/drives/43P0A00AFJDH" "/mnt/drives/53J0A016FJDH" "/mnt/drives/53F0A0SBFJDH" "/mnt/drives/53G0A2AXFJDH" "/mnt/drives/1EKVK21Z" "/mnt/drives/1EJZN6MZ" "/mnt/drives/1EKR513Z" ]; + depends = [ "/mnt/drives/ZVV0688G" "/mnt/drives/ZVV072JR" "/mnt/drives/53F0A0SBFJDH" "/mnt/drives/X2N0A0AZFJDH" "/mnt/drives/53G0A2AXFJDH" "/mnt/drives/92F0A079FJDH" "/mnt/drives/X2N0A0AXFJDH" "/mnt/drives/43P0A00FFJDH" "/mnt/drives/ZA1D9307" "/mnt/drives/1EJZN6MZ" "/mnt/drives/1EKR513Z" "/mnt/drives/1EKVK21Z" ]; }; #"/mnt/box" = { @@ -123,6 +139,7 @@ enable = true; exports = '' /mnt/mergerfs 100.64.0.13(no_subtree_check,fsid=0) + /mnt/mergerfs 100.64.0.7(no_subtree_check,fsid=0) ''; };