Merge remote-tracking branch 'origin/main'

curacao/dk.nix

@@ -1,4 +1,5 @@
 { passwordFile ? "/should_not_be_needed_in_this_context", ... }:
+# TODO Find a way to use keys in filesystem
 # TODO Not relatime everywhere, thank you
 # TODO Default options
 let
@@ -71,11 +72,10 @@ in
               content = {
                 type = "luks";
                 name = "boot";
-                initrdUnlock = false;
                 extraFormatArgs = [ "--type luks1" ];
                 passwordFile = passwordFile;
                 settings = {
-                  keyFile = "/etc/keys/boot";
+                  # keyFile = "/etc/keys/boot";
                 };
                 content = {
                   type = "filesystem";
@@ -94,9 +94,9 @@ in
               content = {
                 type = "luks";
                 name = "razmo";
-                initrdUnlock = false;
+                passwordFile = passwordFile;
                 settings = {
-                  keyFile = "/etc/keys/razmo";
+                  # keyFile = "/etc/keys/razmo";
                 };
                 content = {
                   type = "btrfs";
@@ -129,9 +129,9 @@ in
               content = {
                 type = "luks";
                 name = "rapswap";
-                initrdUnlock = false;
+                passwordFile = passwordFile;
                 settings = {
-                  keyFile = "/etc/keys/rapswap";
+                  # keyFile = "/etc/keys/rapswap";
                   allowDiscards = true;
                 };
                 content = {

curacao/os.nix

@@ -10,6 +10,7 @@
 
   networking.hostName = "curacao";
   boot = {
+    initrd.luks.reusePassphrases = true;
     loader = {
       efi.efiSysMountPoint = "/efi";
     };

os/geoffrey.nix

@@ -4,6 +4,8 @@
     <home-manager/nixos>
   ];
 
+  users.users.root.initialHashedPassword = "$y$j9T$e64bjL7iyVlniEKwKbM9g0$cCn74za0r6L9QMO20Fdxz3/SX0yvhz3Xd6.2BhtbRL1"; # Not a real password
+
   users.users.geoffrey = {
     isNormalUser = true;
     extraGroups = [ "adbusers" "wheel" ];