Use dev Omarchy packages in dev ISO builds

configs/airootfs/root/.automated_script.sh

@@ -13,6 +13,14 @@ set -euo pipefail
 [[ $(tty) == /dev/tty1 ]] || exit 0
 
 export OMARCHY_MIRROR="$(cat /root/omarchy_mirror)"
+if [[ -f /root/omarchy_iso_ref ]]; then
+  export OMARCHY_ISO_REF="$(cat /root/omarchy_iso_ref)"
+fi
+if [[ -f /usr/share/omarchy-iso/package-targets ]]; then
+  # shellcheck disable=SC1091
+  source /usr/share/omarchy-iso/package-targets
+  export OMARCHY_RUNTIME_PACKAGE OMARCHY_SETTINGS_PACKAGE OMARCHY_NVIM_PACKAGE
+fi
 export OMARCHY_PATH=/usr/share/omarchy
 export OMARCHY_INSTALL=$OMARCHY_PATH/install
 export OMARCHY_INSTALL_LOG_FILE=/var/log/omarchy-install.log

configs/airootfs/root/configurator

@@ -261,6 +261,13 @@ unset OMARCHY_CONFIGURATOR_PYTHON
 # installed Omarchy package owns target setup helpers, while the ISO owns the
 # installer UI that runs before any target packages exist.
 OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
+if [[ -f /usr/share/omarchy-iso/package-targets ]]; then
+  # shellcheck disable=SC1091
+  source /usr/share/omarchy-iso/package-targets
+fi
+OMARCHY_RUNTIME_PACKAGE="${OMARCHY_RUNTIME_PACKAGE:-omarchy}"
+OMARCHY_SETTINGS_PACKAGE="${OMARCHY_SETTINGS_PACKAGE:-omarchy-settings}"
+OMARCHY_NVIM_PACKAGE="${OMARCHY_NVIM_PACKAGE:-omarchy-nvim}"
 LOGO_PATH="${LOGO_PATH:-$OMARCHY_PATH/logo.txt}"
 
 TERM_HEIGHT=${LINES:-24}
@@ -1063,7 +1070,8 @@ _EOF_
         "base-devel",
         "git",
         "omarchy-keyring",
-        "omarchy"
+        "$OMARCHY_SETTINGS_PACKAGE",
+        "$OMARCHY_RUNTIME_PACKAGE"
     ],
     "profile_config": {
         "gfx_driver": null,
@@ -1396,7 +1404,8 @@ cat <<-_EOF_ >user_configuration.json
         "base-devel",
         "git",
         "omarchy-keyring",
-        "omarchy"
+        "$OMARCHY_SETTINGS_PACKAGE",
+        "$OMARCHY_RUNTIME_PACKAGE"
     ],
     "profile_config": {
         "gfx_driver": null,