From 4b0e7e2e5ef9c3834694a8a6ff5552b375a0ce63 Mon Sep 17 00:00:00 2001 From: chn Date: Sat, 6 Sep 2025 08:17:47 +0800 Subject: [PATCH] devices.nas: add ssd partitions --- devices/cross/luks-manual/default.nix | 2 ++ devices/nas/default.nix | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/devices/cross/luks-manual/default.nix b/devices/cross/luks-manual/default.nix index 3bbd37b8..2430c63b 100644 --- a/devices/cross/luks-manual/default.nix +++ b/devices/cross/luks-manual/default.nix @@ -8,6 +8,8 @@ let devices = "/dev/disk/by-partlabel/nas-root3" = { mapper = "root3"; ssd = true; }; "/dev/disk/by-partlabel/nas-root4" = { mapper = "root4"; ssd = true; }; "/dev/disk/by-partlabel/nas-swap" = { mapper = "swap"; ssd = true; }; + "/dev/disk/by-partlabel/nas-ssd1" = { mapper = "ssd1"; ssd = true; }; + "/dev/disk/by-partlabel/nas-ssd2" = { mapper = "ssd2"; ssd = true; }; }; vps4."/dev/disk/by-uuid/bf7646f9-496c-484e-ada0-30335da57068" = { mapper = "root"; ssd = true; }; vps6."/dev/disk/by-uuid/961d75f0-b4ad-4591-a225-37b385131060" = { mapper = "root"; ssd = true; }; diff --git a/devices/nas/default.nix b/devices/nas/default.nix index f4992886..12f9432e 100644 --- a/devices/nas/default.nix +++ b/devices/nas/default.nix @@ -12,10 +12,16 @@ inputs: mount = { vfat."/dev/disk/by-partlabel/nas-boot" = "/boot"; - btrfs."/dev/mapper/root1" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; }; + btrfs = + { + "/dev/mapper/root1" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; }; + "/dev/mapper/ssd1"."/nix/ssd" = "/nix/ssd"; + }; }; swap = [ "/dev/mapper/swap" ]; - rollingRootfs.waitDevices = [ "/dev/mapper/root2" "/dev/mapper/root3" "/dev/mapper/root4" ]; + # TODO: snapshot should take place just before switching root + rollingRootfs.waitDevices = + [ "/dev/mapper/root2" "/dev/mapper/root3" "/dev/mapper/root4" "/dev/mapper/ssd1" "/dev/mapper/ssd2" ]; }; initrd.sshd = {}; nixpkgs.march = "alderlake";