From 6bbf09bd990dec5947e96709c5044eeac7b252f5 Mon Sep 17 00:00:00 2001
From: "prompt.ac/@jeffrey" <mail@aesthetic.computer>
Date: Sat, 4 Apr 2026 22:39:14 -0700
Subject: [PATCH] fix: align nix raw image boot config

---
 fedac/nixos/modules/image.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/fedac/nixos/modules/image.nix b/fedac/nixos/modules/image.nix
index e06c65160d..b3507a8e87 100644
--- a/fedac/nixos/modules/image.nix
+++ b/fedac/nixos/modules/image.nix
@@ -6,22 +6,27 @@
   boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
   boot.loader.grub = {
     enable = true;
-    device = "/dev/vda";
+    devices = [ "/dev/vda" ];
     efiSupport = true;
     efiInstallAsRemovable = true;
     configurationLimit = 1;
   };
   boot.loader.timeout = lib.mkForce 0;
   boot.loader.grub.timeoutStyle = lib.mkForce "hidden";
+  boot.growPartition = lib.mkDefault true;
 
   # Make early boot text visible on the real display for debug + fallback boot paths.
   boot.kernelParams = lib.mkAfter [ "console=tty0" ];
 
-  # Let make-disk-image perform a full NixOS install onto a raw disk image.
+  # Match nixpkgs raw-disk expectations so the installed image can boot on
+  # real hardware and expand cleanly after flashing.
   fileSystems."/" = lib.mkForce {
-    device = "/dev/vda";
+    device = "/dev/disk/by-label/nixos";
     fsType = "ext4";
-    autoFormat = true;
+    autoResize = true;
+  };
+  fileSystems."/boot" = lib.mkForce {
+    device = "/dev/disk/by-label/ESP";
+    fsType = "vfat";
   };
-  virtualisation.useBootLoader = lib.mkForce true;
 }
-- 
2.51.2