From f54f445358f50906bd43fe5a907d47ef748604d2 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 10 Feb 2024 00:32:16 +0800 Subject: [PATCH] refactor(focus): convert to global split zfs --- spec/focus/default.nix | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/spec/focus/default.nix b/spec/focus/default.nix index d8e281fe..1ad5e877 100644 --- a/spec/focus/default.nix +++ b/spec/focus/default.nix @@ -5,10 +5,9 @@ auth.openssh.enable = true; fs.esp.uuid = "8C36-CBE2"; fs.type = "zfs"; - fs.zfs.externalStore = true; - fs.external.device = "/dev/disk/by-uuid/59b73292-8098-4774-b8b6-59c23130d405"; - fs.external.fsType = "xfs"; - fs.external.options = [ "noatime" ]; + fs.zfs.split.enable = true; + fs.zfs.split.store = "59b73292-8098-4774-b8b6-59c23130d405"; + fs.zfs.split.secret = "f8983719-f9e7-42b2-b8f3-0f32f6b328ae"; fs.cryptsetup.enable = true; fs.cryptsetup.allowDiscards = false; fs.cryptsetup.uuids.secret = "c2bc361e-6f9a-48fa-b698-ed3603a9664a"; @@ -17,20 +16,6 @@ acme.enable = true; }; - services.fstrim.enable = true; - boot.swraid.enable = true; - boot.swraid.mdadmConf = '' - PROGRAM /usr/bin/true - ''; - fileSystems."/nix/var/secret" = - { device = "/dev/disk/by-uuid/f8983719-f9e7-42b2-b8f3-0f32f6b328ae"; - fsType = "ext4"; - options = [ "noatime" ]; - neededForBoot = true; - depends = [ "/nix/var" ]; - }; - boot.initrd.systemd.services.zfs-import-focus.after = [ "cryptsetup.target" ]; - services.udev.extraRules = '' SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="6c:b3:11:3d:80:13", NAME="2g5" '';