From d6318cbd7cfce228d13cb634ba6c5a623daa3d43 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Fri, 21 Jun 2024 16:10:50 +0800
Subject: [PATCH] hosts/{bootstrap,graphical-installer}: fix config

---
 configs/nixos/bootstrap/default.nix           |  5 +++--
 configs/nixos/graphical-installer/default.nix | 12 +++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configs/nixos/bootstrap/default.nix b/configs/nixos/bootstrap/default.nix
index f9b68e51..77a69bef 100644
--- a/configs/nixos/bootstrap/default.nix
+++ b/configs/nixos/bootstrap/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, foodogsquaredModulesPath, ... }:
+{ lib, config, pkgs, foodogsquaredLib, foodogsquaredModulesPath, ... }:
 
 # Since this will be exported as an installer ISO, you'll have to keep in mind
 # about the added imports from nixos-generators. In this case, it simply adds
@@ -23,9 +23,10 @@
       system.stateVersion = "23.11";
     }
 
-    (lib.mkIf (config.formatAttr == "isoImage") {
+    (lib.mkIf (foodogsquaredLib.nixos.isFormat config "isoImage") {
       isoImage = {
         isoBaseName = config.networking.hostName;
+        edition = "minimal";
 
         squashfsCompression = "zstd -Xcompression-level 11";
 
diff --git a/configs/nixos/graphical-installer/default.nix b/configs/nixos/graphical-installer/default.nix
index 51780ca9..95a9c224 100644
--- a/configs/nixos/graphical-installer/default.nix
+++ b/configs/nixos/graphical-installer/default.nix
@@ -32,9 +32,11 @@
 
       # Use my desktop environment configuration without the apps just to make the
       # closure size smaller.
-      workflows.workflows.a-happy-gnome = {
-        enable = true;
-        extraApps = [ ];
+      workflows = {
+        enable = [ "a-happy-gnome" ];
+        workflows.a-happy-gnome = {
+          extraApps = lib.mkForce [ ];
+        };
       };
 
       # Install the web browser of course. What would be a graphical installer
@@ -62,10 +64,10 @@
     }
 
     (lib.mkIf
-      (foodogsquaredLib.isFormat "graphicalIsoImage") {
+      (foodogsquaredLib.nixos.isFormat config "isoImage") {
       isoImage = {
         isoBaseName = config.networking.hostName;
-        edition = "A Happy GNOME";
+        edition = "a-happy-gnome";
 
         squashfsCompression = "zstd -Xcompression-level 12";
       };