feat(distro): rename ISO targets and fix UEFI boot in live test script
- Rename installerIso and installerIsoGraphical to nomarchy-installer and nomarchy-live. - Update host configurations with proper Nomarchy branding and volume IDs. - Fix nomarchy-test-live-iso QEMU launch by using -drive if=pflash for UEFI firmware. - Add nomarchy-build-live-iso utility script. - Scrub remaining Omarchy references in Plymouth, installer messages, and docs. - Regenerate docs/SCRIPTS.md to reflect new and renamed utilities.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
echo "Building Nomarchy Installer ISO..."
|
||||
|
||||
# The output will be a symlink named 'result' in the current directory
|
||||
nix build .#nixosConfigurations.installerIso.config.system.build.isoImage
|
||||
nix build .#nixosConfigurations.nomarchy-installer.config.system.build.isoImage
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
ISO_PATH=$(readlink -f result/iso/*.iso)
|
||||
|
||||
17
features/scripts/utils/nomarchy-build-live-iso
Executable file
17
features/scripts/utils/nomarchy-build-live-iso
Executable file
@@ -0,0 +1,17 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Build the Nomarchy Live ISO (Full Desktop Environment) using the flake.
|
||||
|
||||
echo "Building Nomarchy Live ISO..."
|
||||
|
||||
# The output will be a symlink named 'result' in the current directory
|
||||
nix build .#nixosConfigurations.nomarchy-live.config.system.build.isoImage
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
ISO_PATH=$(readlink -f result/iso/*.iso)
|
||||
echo "Success! Live ISO built at: $ISO_PATH"
|
||||
echo "You can now burn this to a USB drive using 'dd' or 'etcher'."
|
||||
else
|
||||
echo "Error: Live ISO build failed."
|
||||
exit 1
|
||||
fi
|
||||
@@ -22,7 +22,7 @@ fi
|
||||
# This part ensures that if we are on an installed system, the correct
|
||||
# nixos-hardware module is selected in the configuration.
|
||||
# Skip this in the Live ISO environment
|
||||
if [[ $USER == "nixos" ]] || [[ -f /etc/nixos/hosts/live-iso.nix ]]; then
|
||||
if [[ $USER == "nixos" ]] || [[ -f /etc/nixos/hosts/nomarchy-live.nix ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Build the Nomarchy graphical live ISO and boot it in QEMU for a
|
||||
# try-before-install experience. The ISO is the `installerIsoGraphical`
|
||||
# NixOS configuration — same Nomarchy system + Home Manager stack as
|
||||
# try-before-install experience. The ISO is the `nomarchy-live`
|
||||
# NixOS configuration - same Nomarchy system + Home Manager stack as
|
||||
# `nomarchy-test-vm`, just wrapped in an installable live medium.
|
||||
|
||||
set -e
|
||||
|
||||
echo "Building Nomarchy Live ISO..."
|
||||
nix build .#nixosConfigurations.installerIsoGraphical.config.system.build.isoImage
|
||||
nix build .#nixosConfigurations.nomarchy-live.config.system.build.isoImage
|
||||
|
||||
ISO=$(ls -1 result/iso/*.iso 2>/dev/null | head -n 1)
|
||||
if [ -z "$ISO" ]; then
|
||||
@@ -22,11 +22,19 @@ OVMF_CANDIDATES=(
|
||||
"/run/current-system/sw/share/OVMF/OVMF_CODE.fd"
|
||||
"/run/current-system/sw/share/qemu/edk2-x86_64-code.fd"
|
||||
"/nix/var/nix/profiles/system/sw/share/OVMF/OVMF_CODE.fd"
|
||||
"/usr/share/OVMF/OVMF_CODE.fd"
|
||||
)
|
||||
BIOS_ARG=()
|
||||
for c in "${OVMF_CANDIDATES[@]}"; do
|
||||
if [ -f "$c" ]; then
|
||||
BIOS_ARG=(-bios "$c")
|
||||
# Use pflash for UEFI firmware. -bios is for legacy BIOS.
|
||||
BIOS_ARG=(-drive "if=pflash,format=raw,readonly=on,file=$c")
|
||||
|
||||
# Optional: Add matching VARS file if it exists.
|
||||
VARS="${c%_CODE.fd}_VARS.fd"
|
||||
if [ -f "$VARS" ]; then
|
||||
BIOS_ARG+=(-drive "if=pflash,format=raw,readonly=on,file=$VARS")
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user