From 56fb1959677adb4e285103d47c3477aa7bcbe3a3 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 2 Jan 2026 14:41:08 -0600
Subject: [PATCH] upd

---
 modules/nixos/disko/default.nix       | 4 ++--
 modules/nixos/disko/options.nix       | 5 ++++-
 modules/nixos/user/default.nix        | 2 ++
 systems/aarch64-linux/pi4/default.nix | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/nixos/disko/default.nix b/modules/nixos/disko/default.nix
index ee3a126..4b64f04 100644
--- a/modules/nixos/disko/default.nix
+++ b/modules/nixos/disko/default.nix
@@ -143,8 +143,8 @@ in
               };
             };
           };
-          firmware = lib.mkIf cfg.enableFirmware {
-            device = "/dev/mmcblk0";
+          firmware = lib.mkIf cfg.firmware.enableFirmware {
+            device = cfg.firmware.firmwareDrive;
             type = "disk";
             imageSize = "1G";
             content = {
diff --git a/modules/nixos/disko/options.nix b/modules/nixos/disko/options.nix
index eed9f77..f6554b0 100644
--- a/modules/nixos/disko/options.nix
+++ b/modules/nixos/disko/options.nix
@@ -19,7 +19,10 @@ in
 
     enableLuks = mkBoolOpt false "Enable Luks";
 
-    enableFirmware = mkBoolOpt false "Enable rpi firmware part";
+    firmware = {
+      enableFirmware = mkBoolOpt false "Enable rpi firmware part";
+      firmwareDisk = mkOpt types.str "/dev/mmcblk0" "UEFI firmware disk";
+    };
 
     swapSize = mkOpt types.str "16G" "size of swap part";
 
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index 25b8042..ff327cd 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -27,6 +27,8 @@ 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; {
diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix
index 3fb39de..fb60b59 100755
--- a/systems/aarch64-linux/pi4/default.nix
+++ b/systems/aarch64-linux/pi4/default.nix
@@ -29,7 +29,10 @@
     hardware = {
       disko = {
         enable = true;
-        enableFirmware = false;
+        firmware = {
+          enableFirmware = true;
+          firmwareDisk = "/dev/mmcblk1";
+        };
       };
       raspberry-pi = {
         enable = true;