From fedf84949943eee73640f085b394875074cec17b Mon Sep 17 00:00:00 2001 From: kalipso Date: Fri, 20 Dec 2024 23:47:25 +0100 Subject: [PATCH] [fanny] set neededForBoot flags --- machines/fanny/configuration.nix | 1 + machines/modules/disko/fanny.nix | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/machines/fanny/configuration.nix b/machines/fanny/configuration.nix index a4622126..7997d719 100644 --- a/machines/fanny/configuration.nix +++ b/machines/fanny/configuration.nix @@ -18,6 +18,7 @@ cacheurl = "https://cache.dynamicdiscord.de"; }; + boot.initrd.systemd.enable = true; boot.loader.systemd-boot.enable = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; diff --git a/machines/modules/disko/fanny.nix b/machines/modules/disko/fanny.nix index 9366fe6c..0ac2a1c9 100644 --- a/machines/modules/disko/fanny.nix +++ b/machines/modules/disko/fanny.nix @@ -93,7 +93,7 @@ }; # use this to read the key during boot postCreateHook = '' - zfs set keylocation="prompt" "zroot/$name"; + zfs set keylocation="prompt" zroot/encrypted; ''; }; "encrypted/root" = { @@ -136,7 +136,7 @@ # use this to read the key during boot postCreateHook = '' - zfs set keylocation="prompt" "zroot/$name"; + zfs set keylocation="prompt" storage/encrypted; ''; }; "encrypted/data" = { @@ -147,4 +147,11 @@ }; }; }; + + fileSystems."/".neededForBoot = true; + fileSystems."/boot".neededForBoot = true; + fileSystems."/var".neededForBoot = true; + fileSystems."/etc".neededForBoot = true; + fileSystems."/home".neededForBoot = true; + fileSystems."/nix".neededForBoot = true; }