From 649c2f986b17f5f8e6e08d5ce399b74b3d6814e1 Mon Sep 17 00:00:00 2001
From: rogueking <miguel@muniz.org>
Date: Sun, 14 Jun 2026 22:34:58 -0400
Subject: [PATCH] fixing iso issue

---
 hosts/acheron/iso.nix  | 15 ++++++---------
 hosts/armaros/iso.nix  | 15 ++++++---------
 hosts/buildbox/iso.nix | 19 +++++--------------
 hosts/eva-01/iso.nix   | 16 ++++++----------
 hosts/eva-03/iso.nix   | 15 ++++++---------
 hosts/iso/default.nix  |  5 +++++
 6 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/hosts/acheron/iso.nix b/hosts/acheron/iso.nix
index 12d9392..6435c23 100644
--- a/hosts/acheron/iso.nix
+++ b/hosts/acheron/iso.nix
@@ -1,17 +1,14 @@
 # ── acheron rescue / installer ISO ─────────────────────────────
-{
-  config,
-  pkgs,
-  pkgs-unstable,
-  lib,
-  ...
-}: {
+# ISO for VM / server deployment. Supports both BIOS (SeaBIOS) and
+# UEFI boot for maximum Proxmox compatibility.
+{ config, pkgs, pkgs-unstable, lib, ... }: {
   imports = [
     ../iso/default.nix
   ];
 
-  boot.loader.grub.enable = lib.mkDefault true;
-  boot.loader.grub.devices = ["nodev"];
+  # Support both BIOS and UEFI boot
+  isoImage.makeBiosBootable = true;
+  isoImage.makeEfiBootable = true;
 
   iso.extraPackages = with pkgs; [btrfs-progs];
   iso.diskoConfig = ./disko-config.nix;
diff --git a/hosts/armaros/iso.nix b/hosts/armaros/iso.nix
index 90a3d1b..6cfbe31 100644
--- a/hosts/armaros/iso.nix
+++ b/hosts/armaros/iso.nix
@@ -1,17 +1,14 @@
 # ── armaros rescue / installer ISO ─────────────────────────────
-{
-  config,
-  pkgs,
-  pkgs-unstable,
-  lib,
-  ...
-}: {
+# ISO for VM / server deployment. Supports both BIOS (SeaBIOS) and
+# UEFI boot for maximum Proxmox compatibility.
+{ config, pkgs, pkgs-unstable, lib, ... }: {
   imports = [
     ../iso/default.nix
   ];
 
-  boot.loader.grub.enable = lib.mkDefault true;
-  boot.loader.grub.devices = ["nodev"];
+  # Support both BIOS and UEFI boot
+  isoImage.makeBiosBootable = true;
+  isoImage.makeEfiBootable = true;
 
   iso.extraPackages = with pkgs; [btrfs-progs];
   iso.diskoConfig = ./disko-config.nix;
diff --git a/hosts/buildbox/iso.nix b/hosts/buildbox/iso.nix
index 0c36bca..f41db08 100644
--- a/hosts/buildbox/iso.nix
+++ b/hosts/buildbox/iso.nix
@@ -1,23 +1,14 @@
 # ── buildbox rescue / installer ISO ────────────────────────────
-{
-  config,
-  pkgs,
-  pkgs-unstable,
-  lib,
-  ...
-}: {
+# ISO for VM deployment. Supports both BIOS (SeaBIOS) and
+# UEFI boot for maximum Proxmox compatibility.
+{ config, pkgs, pkgs-unstable, lib, ... }: {
   imports = [
     ../iso/default.nix
   ];
 
-  # Enable BIOS (MBR) boot for SeaBIOS compatibility in Proxmox
-  boot.loader.grub.enable = lib.mkDefault true;
-  boot.loader.grub.devices = ["nodev"];
-  boot.loader.grub.efiSupport = false;
-
-  # Build ISO with both BIOS and UEFI support
-  isoImage.makeEfiBootable = true;
+  # Support both BIOS and UEFI boot
   isoImage.makeBiosBootable = true;
+  isoImage.makeEfiBootable = true;
 
   iso.extraPackages = with pkgs; [btrfs-progs];
   iso.diskoConfig = ./disko-config.nix;
diff --git a/hosts/eva-01/iso.nix b/hosts/eva-01/iso.nix
index c0011c2..74662a6 100644
--- a/hosts/eva-01/iso.nix
+++ b/hosts/eva-01/iso.nix
@@ -1,18 +1,14 @@
 # ── eva-01 rescue / installer ISO ──────────────────────────────
-{
-  config,
-  pkgs,
-  pkgs-unstable,
-  lib,
-  ...
-}: {
+# ISO for deploying on physical hardware (ThinkPad X1 Nano).
+# Supports both BIOS and UEFI boot.
+{ config, pkgs, pkgs-unstable, lib, ... }: {
   imports = [
     ../iso/default.nix
   ];
 
-  # Boot — EFI + legacy BIOS for broad hardware compatibility
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  # Support both BIOS and UEFI boot
+  isoImage.makeBiosBootable = true;
+  isoImage.makeEfiBootable = true;
 
   # Extra tools for Btrfs rescue
   iso.extraPackages = with pkgs; [
diff --git a/hosts/eva-03/iso.nix b/hosts/eva-03/iso.nix
index 47c5742..f8f3ad5 100644
--- a/hosts/eva-03/iso.nix
+++ b/hosts/eva-03/iso.nix
@@ -1,17 +1,14 @@
 # ── eva-03 rescue / installer ISO ──────────────────────────────
-{
-  config,
-  pkgs,
-  pkgs-unstable,
-  lib,
-  ...
-}: {
+# ISO for deploying on physical hardware.
+# Supports both BIOS and UEFI boot.
+{ config, pkgs, pkgs-unstable, lib, ... }: {
   imports = [
     ../iso/default.nix
   ];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  # Support both BIOS and UEFI boot
+  isoImage.makeBiosBootable = true;
+  isoImage.makeEfiBootable = true;
 
   iso.diskoConfig = ./disko-config.nix;
   iso.description = "eva-03 Rescue ISO";
diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix
index c4a4424..f70e5ac 100644
--- a/hosts/iso/default.nix
+++ b/hosts/iso/default.nix
@@ -18,6 +18,11 @@
 }: let
   cfg = config.iso;
 in {
+  # Disable disko config application on ISOs — we only want the disko CLI tool.
+  # Without this, disko would try to apply filesystems/boot config at build time,
+  # which conflicts with ISO-specific overrides and can cause boot failures.
+  disko.enableConfig = false;
+
   options.iso = {
     diskoConfig = lib.mkOption {
       type = lib.types.path;