From 7d0e089e3f643dd2c4e0b79d2fa04ba15586cfd9 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Sat, 21 Jun 2025 16:28:16 +0300 Subject: [PATCH] use hostId for luks disks Signed-off-by: unexplrd --- hosts/dunamis/disko/default.nix | 9 +++++++-- hosts/dunamis/disko/disk-main.nix | 7 +++++-- hosts/eldrid/disko/default.nix | 9 +++++++-- hosts/eldrid/disko/disk-main.nix | 7 +++++-- hosts/legion/disko/default.nix | 11 ++++++++--- hosts/legion/disko/disk-main.nix | 7 +++++-- hosts/legion/disko/disk-second.nix | 7 +++++-- hosts/morphius/disko/default.nix | 9 +++++++-- hosts/morphius/disko/disk-main.nix | 8 ++++++-- hosts/sarien/disko/default.nix | 9 +++++++-- 10 files changed, 62 insertions(+), 21 deletions(-) diff --git a/hosts/dunamis/disko/default.nix b/hosts/dunamis/disko/default.nix index 881ae36..900a745 100644 --- a/hosts/dunamis/disko/default.nix +++ b/hosts/dunamis/disko/default.nix @@ -1,4 +1,9 @@ -{inputs, ...}: let +{ + config, + inputs, + ... +}: let + inherit (config.networking) hostId; disk = "/dev/disk/by-id/nvme-eui.000000000000000100a075244b5d6185"; in { imports = with inputs; [ @@ -10,5 +15,5 @@ in { mountOptions = ["rw" "nosuid" "nodev"]; }; }; - disko.devices.disk.main = import ./disk-main.nix {inherit disk;}; + disko.devices.disk.main = import ./disk-main.nix {inherit disk hostId;}; } diff --git a/hosts/dunamis/disko/disk-main.nix b/hosts/dunamis/disko/disk-main.nix index c076947..87c6555 100644 --- a/hosts/dunamis/disko/disk-main.nix +++ b/hosts/dunamis/disko/disk-main.nix @@ -1,4 +1,7 @@ -{disk, ...}: { +{ + disk, + hostId, +}: { type = "disk"; device = disk; content = { @@ -25,7 +28,7 @@ size = "100%"; content = { type = "luks"; - name = "luks-main"; + name = "luks-" + hostId; initrdUnlock = true; settings.allowDiscards = true; content = let diff --git a/hosts/eldrid/disko/default.nix b/hosts/eldrid/disko/default.nix index 3df18e9..87acebc 100644 --- a/hosts/eldrid/disko/default.nix +++ b/hosts/eldrid/disko/default.nix @@ -1,4 +1,9 @@ -{inputs, ...}: let +{ + config, + inputs, + ... +}: let + inherit (config.networking) hostId; disk = "/dev/disk/by-id/nvme-eui.e8238fa6bf530001001b444a44022ad0"; in { imports = with inputs; [ @@ -10,5 +15,5 @@ in { mountOptions = ["rw" "nosuid" "nodev"]; }; }; - disko.devices.disk.main = import ./disk-main.nix {inherit disk;}; + disko.devices.disk.main = import ./disk-main.nix {inherit config disk hostId;}; } diff --git a/hosts/eldrid/disko/disk-main.nix b/hosts/eldrid/disko/disk-main.nix index b4a41b1..8992a18 100644 --- a/hosts/eldrid/disko/disk-main.nix +++ b/hosts/eldrid/disko/disk-main.nix @@ -1,4 +1,7 @@ -{disk, ...}: { +{ + disk, + hostId, +}: { type = "disk"; device = disk; content = { @@ -25,7 +28,7 @@ size = "100%"; content = { type = "luks"; - name = "luks-main"; + name = "luks-" + hostId; initrdUnlock = true; settings.allowDiscards = true; content = { diff --git a/hosts/legion/disko/default.nix b/hosts/legion/disko/default.nix index bf6d826..e78cf26 100644 --- a/hosts/legion/disko/default.nix +++ b/hosts/legion/disko/default.nix @@ -1,4 +1,9 @@ -{inputs, ...}: let +{ + config, + inputs, + ... +}: let + inherit (config.networking) hostId; disk-main = "/dev/disk/by-id/nvme-INTEL_SSDPEKKF256G8L_BTHH81460QC2256B"; disk-second = "/dev/disk/by-id/nvme-WDC_PC_SN730_SDBPNTY-1T00-1101_21114D802446"; in { @@ -11,6 +16,6 @@ in { mountOptions = ["rw" "nosuid" "nodev"]; }; }; - disko.devices.disk.main = import ./disk-main.nix {inherit disk-main;}; - disko.devices.disk.second = import ./disk-second.nix {inherit disk-second;}; + disko.devices.disk.main = import ./disk-main.nix {inherit disk-main hostId;}; + disko.devices.disk.second = import ./disk-second.nix {inherit disk-second hostId;}; } diff --git a/hosts/legion/disko/disk-main.nix b/hosts/legion/disko/disk-main.nix index 5736835..5ccd053 100644 --- a/hosts/legion/disko/disk-main.nix +++ b/hosts/legion/disko/disk-main.nix @@ -1,4 +1,7 @@ -{disk-main}: { +{ + disk-main, + hostId, +}: { type = "disk"; device = disk-main; content = { @@ -25,7 +28,7 @@ size = "100%"; content = { type = "luks"; - name = "luks-main"; + name = "luks-" + hostId; initrdUnlock = true; settings.allowDiscards = true; content = { diff --git a/hosts/legion/disko/disk-second.nix b/hosts/legion/disko/disk-second.nix index 2922e3e..ca4460a 100644 --- a/hosts/legion/disko/disk-second.nix +++ b/hosts/legion/disko/disk-second.nix @@ -1,4 +1,7 @@ -{disk-second}: { +{ + disk-second, + hostId, +}: { type = "disk"; device = disk-second; content = { @@ -8,7 +11,7 @@ size = "100%"; content = { type = "luks"; - name = "luks-second"; + name = "luks-${hostId}-second"; initrdUnlock = true; settings.allowDiscards = true; content = { diff --git a/hosts/morphius/disko/default.nix b/hosts/morphius/disko/default.nix index aa8982a..48f438b 100644 --- a/hosts/morphius/disko/default.nix +++ b/hosts/morphius/disko/default.nix @@ -1,4 +1,9 @@ -{inputs, ...}: let +{ + config, + inputs, + ... +}: let + inherit (config.networking) hostId; disk = "/dev/nvme0n1"; in { imports = with inputs; [ @@ -10,5 +15,5 @@ in { mountOptions = ["rw" "nosuid" "nodev"]; }; }; - disko.devices.disk.main = import ./disk-main.nix {inherit disk;}; + disko.devices.disk.main = import ./disk-main.nix {inherit disk hostId;}; } diff --git a/hosts/morphius/disko/disk-main.nix b/hosts/morphius/disko/disk-main.nix index cd67be2..cf82ffe 100644 --- a/hosts/morphius/disko/disk-main.nix +++ b/hosts/morphius/disko/disk-main.nix @@ -1,4 +1,8 @@ -{disk, ...}: { +{ + disk, + hostId, + ... +}: { type = "disk"; device = disk; content = { @@ -25,7 +29,7 @@ size = "100%"; content = { type = "luks"; - name = "luks-main"; + name = "luks-" + hostId; initrdUnlock = true; settings.allowDiscards = true; content = { diff --git a/hosts/sarien/disko/default.nix b/hosts/sarien/disko/default.nix index 8468027..f1c5e54 100644 --- a/hosts/sarien/disko/default.nix +++ b/hosts/sarien/disko/default.nix @@ -1,4 +1,9 @@ -{inputs, ...}: let +{ + config, + inputs, + ... +}: let + inherit (config.networking) hostId; disk = "/dev/disk/by-id/nvme-eui.0025385911b36714"; in { imports = with inputs; [ @@ -11,5 +16,5 @@ in { }; }; # same partitioning setup - disko.devices.disk.main = import ../../dunamis/disko/disk-main.nix {inherit disk;}; + disko.devices.disk.main = import ../../dunamis/disko/disk-main.nix {inherit disk hostId;}; }