fix

modules/nixos/disko/default.nix

@@ -144,7 +144,7 @@ in
             };
           };
           firmware = lib.mkIf cfg.firmware.enableFirmware {
-            device = cfg.firmware.firmwareDrive;
+            device = cfg.firmware.firmwareDisk;
             type = "disk";
             imageSize = "1G";
             content = {

modules/nixos/user/default.nix

@@ -8,7 +8,13 @@
 with lib;
 let
   inherit (lib.${namespace}) mkOpt mkBoolOpt;
-  cfg = config.${namespace}.user;
+  cfg = config.${namespace}.user // {
+    hashedPasswordFile = (if (config.${namespace}.user.hashedPassword == null && 
+        config.${namespace}.user.hashedPasswordFile == null && 
+        config.${namespace}.user.password == null) then 
+        defaultPasswordFile else null
+    );
+  };
 
   # Common SSH keys used across systems
   commonSshKeys = [
@@ -27,8 +33,6 @@ let
   ];
 
   defaultPasswordFile = config.sops.secrets."matt_password".path;
-
-  cfg.hashedPasswordFile = (if (cfg.hashedPassword == null && cfg.hashedPasswordFile == null && cfg.password == null) then defaultPasswordFile else null);
 in
 {
   options.${namespace}.user = with types; {