From 84dec181e119f1792087314383d4cca9c88364d9 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Wed, 20 Aug 2025 19:52:54 +0200
Subject: [PATCH] Renamed configurator

---
 builder/cmds/autostart.sh                 | 8 ++++----
 builder/online.sh                         | 7 ++++---
 builder/patches/offline/permissions.patch | 2 +-
 builder/patches/profiledef.patch          | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/builder/cmds/autostart.sh b/builder/cmds/autostart.sh
index e0193df..fcb56f6 100644
--- a/builder/cmds/autostart.sh
+++ b/builder/cmds/autostart.sh
@@ -25,13 +25,13 @@ catch_errors() {
 trap catch_errors ERR
 
 if [[ $(tty) == "/dev/tty1" ]]; then
-  # Configurator for new user install
-  NETWORK_NEEDED=1 ./installer
+  # Configurator for user information, disk selection, and wifi configuration
+  NETWORK_NEEDED=1 ./configurator
 
   # Get username from installer config for reliable error recovery
   OMARCHY_USER="$(jq -r '.users[0].username' user_credentials.json)"
 
-  # Install using files generated by the ./installer
+  # Install using files generated by the ./configurator
   archinstall \
     --config user_configuration.json \
     --creds user_credentials.json \
@@ -46,6 +46,6 @@ $OMARCHY_USER ALL=(ALL:ALL) NOPASSWD: ALL
 EOF
   chmod 440 /mnt/etc/sudoers.d/99-omarchy-installer
 
-  # Install from the Omarchy web installer
+  # Run Omarchy web installer
   chroot_bash -lc "wget -qO- https://omarchy.org/install-dev | bash"
 fi
diff --git a/builder/online.sh b/builder/online.sh
index eda42ae..dc195a9 100755
--- a/builder/online.sh
+++ b/builder/online.sh
@@ -5,7 +5,7 @@ set -e
 pacman-key --init
 pacman --noconfirm -Sy archlinux-keyring archiso sudo base-devel wget git
 
-# Packages needed for when we run the Omarchy installer
+# Packages needed for the Omarchy configurator (installer will fetch its own)
 arch_packages=(git wget gum openssl iw jq)
 
 # We build our iso here
@@ -19,8 +19,9 @@ cp -r /archiso/configs/releng/* .
 # Add our needed packages to packages.x86_64
 printf '%s\n' "${arch_packages[@]}" >>"packages.x86_64"
 
-# Insert the configurator in the root users home folder (default user in the official releng ISO profile).
-wget -qO "airootfs/root/installer" https://raw.githubusercontent.com/omacom-io/omarchy-installer/HEAD/installer
+# Retrieve the latest configurator for setting up user and selecting install disk.
+wget -qO "airootfs/root/configurator" \
+  https://raw.githubusercontent.com/omacom-io/omarchy-configurator/HEAD/configurator
 
 # Avoid using reflector for mirror identification as we are relying on the global CDN
 rm "airootfs/etc/systemd/system/multi-user.target.wants/reflector.service"
diff --git a/builder/patches/offline/permissions.patch b/builder/patches/offline/permissions.patch
index c032fa2..6e7dee8 100644
--- a/builder/patches/offline/permissions.patch
+++ b/builder/patches/offline/permissions.patch
@@ -4,7 +4,7 @@
    ["/root"]="0:0:750"
    ["/root/.automated_script.sh"]="0:0:755"
    ["/root/.gnupg"]="0:0:700"
-+  ["/root/installer"]="0:0:755"
++  ["/root/configurator"]="0:0:755"
 +  ["/var/cache/omarchy/mirror/offline/"]="0:0:775"
 +  ["/root/check_connectivity.sh"]="0:0:755"
    ["/usr/local/bin/choose-mirror"]="0:0:755"
diff --git a/builder/patches/profiledef.patch b/builder/patches/profiledef.patch
index 529731c..0181cb8 100644
--- a/builder/patches/profiledef.patch
+++ b/builder/patches/profiledef.patch
@@ -20,6 +20,6 @@
    ["/usr/local/bin/choose-mirror"]="0:0:755"
 -  ["/usr/local/bin/Installation_guide"]="0:0:755"
 -  ["/usr/local/bin/livecd-sound"]="0:0:755"
-+  ["/root/installer"]="0:0:755"
++  ["/root/configurator"]="0:0:755"
  )