✅ test(region): run timezone tests when invoked directly

- ✅ the new class sat below `unittest.main()`, so running the file directly exited before defining it; suite discovery still found it

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SdXqTwm63rRMwotZ1xqLC8

README.md

@@ -26,10 +26,22 @@ For local development, build the ISO from sibling checkouts:
 
 Despite the local folder name, the first argument is the Omarchy source checkout (runtime commands, configs, setup scripts, themes, shell, migrations). The installer itself lives in this ISO repo.
 
-The configurator asks for the language on its first screen: English or Simplified Chinese. Chinese reruns the installer in cage + foot, a console that draws Chinese, with Noto Sans Mono CJK unpacked from the offline mirror's `noto-fonts-cjk`. It opens on the keyboard screen, offers only keyboards with a US keymap (cage keeps a US layout) and preselects Chinese (Simplified, Pinyin); every later screen and the install progress read in Chinese. Esc there goes back to a bilingual language screen, where English returns to the VT, which applies the chosen keymap. Without a working display or the font, Chinese continues in English on the VT. Either way a Chinese install sets the target's `LANG` to `zh_CN.UTF-8` through archinstall's `locale_config`. The language never decides the region: that follows the timezone. The Chinese text lives in `OMARCHY_ZH` tables beside the English it replaces.
-
 Use `--dev` or `--rc` to build against those package channels. Both `--dev` and `--edge` select the dev packages from the edge mirror.
 
+### Regional builds
+
+`--region cn` adds China bootstrap defaults independently of the channel. The default, `--region global`, preserves the existing package set, mirrors, cache paths, and artifact names. Supported country profiles use lowercase ISO 3166-1 alpha-2 codes; currently only `cn` is implemented.
+
+For an unpublished regional runtime, use matching local source and package-recipe checkouts:
+
+```bash
+./bin/omarchy-iso-make --region cn --no-boot-offer --local-source /path/to/omarchy /path/to/omarchy-pkgs
+```
+
+China builds keep the channel mirror first, append the USTC Arch mirror, and add ArchLinuxCN with its verified keyring. These are a practical bridge until Omarchy runs its own mirror in China; USTC is rolling, not a matching stable/RC snapshot, so fallback version compatibility is not guaranteed. The region architecture also stages optional new-user defaults before user creation, including deferred setup, without touching existing homes. The China profile ships repository defaults and preselects `Asia/Shanghai` as the timezone; language and input-method defaults come as separate changes. See `docs/regions.md` in the companion runtime checkout.
+
+Non-global cache and ISO names gain a `-cn` suffix. A runtime without the selected profile fails the build. These builds require an x86_64 Arch container environment; packaging checks on another architecture do not substitute for a fresh build, offline installation, and graphical acceptance run.
+
 ## Autoinstall
 
 The shipped ISO installs itself with no keyboard when it finds its configuration on a second drive. Attach a drive labeled `cidata` alongside the ISO and the installer copies the config off it and skips the configurator; with no such drive, nothing changes and the wizard runs as usual. No rebuild, no extra boot entry.
@@ -64,8 +76,6 @@ When `authorized_keys` is present, autoinstall installs it as the user's `~/.ssh
 
 When `tailscale_authkey` is present (one key, blank lines and `#` comments ignored), the install adds the `tailscale` package from the ISO's bundled mirror — nothing is fetched from the network at install or boot — and stages the join for first boot: the key lands at `/etc/tailscale/authkey` (root-only), `tailscaled` is enabled, ufw allows traffic in on `tailscale0`, and a background unit runs `tailscale up` once the network is actually up, retrying until it succeeds without holding up the boot. After a successful join the key is deleted and the unit disables itself; until then both survive reboots, so a machine installed offline joins whenever it first gets connectivity. The node appears on the tailnet under the configured hostname. Use a reusable, pre-authorized (tagged) key so one drive image serves many machines — or an ephemeral key for disposable VMs.
 
-The region follows `timezone`, exactly as in an interactive install: a timezone listed in one of the runtime's region profiles (`default/regions/*/timezones`, such as `Asia/Shanghai` for `cn`) selects that profile's mirrors and repositories, and anything else is global. Set `omarchy_install.region` in `user_configuration.json` to pick one explicitly, for example `"cn"` on a deferred-provisioning install, which carries `UTC` until first boot. Every ISO bundles every profile's packages, so a regional install still needs no network.
-
 ### Building the drive
 
 ```bash

bin/omarchy-iso-make

@@ -6,8 +6,17 @@ NO_CACHE=""
 KEEP_PKG_CACHE=""
 LOCAL_OMARCHY_PATH=""
 LOCAL_PKGS_PATH=""
+OMARCHY_REGION="${OMARCHY_REGION:-global}"
 while [[ $# -gt 0 ]]; do
   case $1 in
+  --region)
+    OMARCHY_REGION="${2:-}"
+    if [[ $OMARCHY_REGION != "global" && $OMARCHY_REGION != "cn" ]]; then
+      echo "Error: --region requires global or cn (ISO 3166-1 alpha-2)." >&2
+      exit 1
+    fi
+    shift 2
+    ;;
   --no-cache)
     NO_CACHE=1
     shift
@@ -57,12 +66,17 @@ while [[ $# -gt 0 ]]; do
     ;;
   *)
     echo "Unknown option: $1"
-    echo "Usage: $0 [--no-cache] [--keep-pkg-cache] [--no-boot-offer] [--debug] [--edge] [--dev|--rc] [--local-source <omarchy-checkout> <pkgs-checkout>]"
+    echo "Usage: $0 [--no-cache] [--keep-pkg-cache] [--no-boot-offer] [--debug] [--edge] [--dev|--rc] [--region global|cn] [--local-source <omarchy-checkout> <pkgs-checkout>]"
     exit 1
     ;;
   esac
 done
 
+if [[ $OMARCHY_REGION != "global" && $OMARCHY_REGION != "cn" ]]; then
+  echo "Error: unsupported region '$OMARCHY_REGION'. Expected global or cn." >&2
+  exit 1
+fi
+
 if [[ -n $LOCAL_OMARCHY_PATH ]]; then
   [[ -d $LOCAL_OMARCHY_PATH ]] || { echo "Error: Omarchy checkout not found at $LOCAL_OMARCHY_PATH" >&2; exit 1; }
   [[ -d $LOCAL_PKGS_PATH ]]    || { echo "Error: pkgs checkout not found at $LOCAL_PKGS_PATH" >&2; exit 1; }
@@ -116,6 +130,10 @@ BUILD_SCRIPT="builder/build-iso.sh"
 BUILD_ROOT=$(realpath "${BASH_SOURCE[0]%/*}/..")
 BUILD_RELEASE_PATH="$BUILD_ROOT/release"
 mkdir -p "$BUILD_RELEASE_PATH"
+# Each build writes into its own directory, so concurrent builds (such as a
+# global and a regional one) never pick up and rename each other's ISO.
+BUILD_OUT=$(mktemp -d "$BUILD_RELEASE_PATH/.build-XXXXXX")
+trap 'rm -rf "$BUILD_OUT"' EXIT
 
 OMARCHY_ISO_REF="${OMARCHY_ISO_REF:-quattro}"
 OMARCHY_MIRROR="${OMARCHY_MIRROR:-stable}"
@@ -125,10 +143,11 @@ DOCKER_ARGS=(
   --privileged
   -e "OMARCHY_ISO_REF=$OMARCHY_ISO_REF"
   -e "OMARCHY_MIRROR=$OMARCHY_MIRROR"
+  -e "OMARCHY_REGION=$OMARCHY_REGION"
   -e "OMARCHY_INSTALL_DEBUG=${OMARCHY_INSTALL_DEBUG:-}"
   -e "HOST_UID=$(id -u)"
   -e "HOST_GID=$(id -g)"
-  -v "$BUILD_RELEASE_PATH/:/out/"
+  -v "$BUILD_OUT/:/out/"
   -v "$BUILD_ROOT/$BUILD_SCRIPT:/$BUILD_SCRIPT:ro"
   -v "$BUILD_ROOT/archiso:/archiso:ro"
   -v "$BUILD_ROOT/builder:/builder:ro"
@@ -146,10 +165,14 @@ if [[ -d /var/cache/pacman/pkg ]]; then
   DOCKER_ARGS+=(-v "/var/cache/pacman/pkg:/var/cache/pacman/pkg")
 fi
 
-# Mount the build cache directory where packages are downloaded. Channels use
-# different package snapshots and must never share an offline mirror cache.
+# Channels and regions must not share an offline mirror cache. Keep the
+# existing global cache path and artifact suffix unchanged.
+region_suffix=""
+if [[ $OMARCHY_REGION != "global" ]]; then
+  region_suffix="-$OMARCHY_REGION"
+fi
 if [[ -z "$NO_CACHE" ]]; then
-  OFFLINE_REPO_BUILD_CACHE_DIR="$HOME/.cache/omarchy/iso_${OMARCHY_MIRROR}/airootfs/var/cache/omarchy"
+  OFFLINE_REPO_BUILD_CACHE_DIR="$HOME/.cache/omarchy/iso_${OMARCHY_MIRROR}${region_suffix}/airootfs/var/cache/omarchy"
   mkdir -p "$OFFLINE_REPO_BUILD_CACHE_DIR"
   DOCKER_ARGS+=(-v "$OFFLINE_REPO_BUILD_CACHE_DIR:/var/cache/airootfs/var/cache/omarchy")
 else
@@ -168,9 +191,14 @@ fi
 
 "${DOCKER[@]}" run "${DOCKER_ARGS[@]}" archlinux/archlinux:latest /$BUILD_SCRIPT
 
-latest_iso=$(\ls -t "$BUILD_RELEASE_PATH"/*.iso | head -n1)
-iso_ref="${latest_iso%.*}-$OMARCHY_ISO_REF.iso"
-mv -f "$latest_iso" "$iso_ref"
+built_isos=("$BUILD_OUT"/*.iso)
+if (( ${#built_isos[@]} != 1 )) || [[ ! -f ${built_isos[0]} ]]; then
+  echo "Error: expected exactly one ISO in $BUILD_OUT" >&2
+  exit 1
+fi
+built_iso_name=$(basename "${built_isos[0]}" .iso)
+iso_ref="$BUILD_RELEASE_PATH/$built_iso_name-${OMARCHY_ISO_REF}${region_suffix}.iso"
+mv -f "${built_isos[0]}" "$iso_ref"
 
 if [[ -z "${NO_BOOT_OFFER:-}" ]]; then
   echo

bin/omarchy-iso-test

@@ -13,11 +13,7 @@
 #
 # Usage: omarchy-iso-test [release/omarchy.iso] [options]
 #
-#   --keyboard LABEL   English (US/UK), Japanese, Japanese (US keyboard), Korean,
-#                      or Chinese (Simplified, Pinyin)/(Traditional, Zhuyin).
-#                      OMARCHY_PATH must be the source tree used to build the ISO.
 #   --encrypt          Drive the encrypted install flow (default: unencrypted)
-#   --language LANG    Pick en (default) or zh; zh keeps the preselected Pinyin keyboard
 #   --provision              Drive the deferred-provisioning install flow: no user during install, the
 #                      first boot runs omarchy-provision-owner and creates it there
 #   --reuse-base       Skip the install phase if a base image already exists
@@ -43,7 +39,6 @@ MEMORY=8192
 INSTALL_TIMEOUT=2400
 BOOT_TIMEOUT=600
 ENCRYPT=false
-INSTALL_LANGUAGE=en
 PROVISION=false
 REUSE_BASE=false
 INSTALL_ONLY=false
@@ -52,16 +47,13 @@ NO_PREVIEW=false
 SYNC_DIR=""
 SYNC_ALL=false
 
-KEYBOARD_LABEL="English (US)"
 GUEST_USER="omarchy"
 GUEST_PASSWORD="omarchy"
 GUEST_HOSTNAME="omarchy-test"
 
 while (($#)); do
   case "$1" in
-    --keyboard) KEYBOARD_LABEL="$2"; shift ;;
     --encrypt) ENCRYPT=true ;;
-    --language) INSTALL_LANGUAGE="$2"; shift ;;
     --provision) PROVISION=true ;;
     --reuse-base) REUSE_BASE=true ;;
     --install-only) INSTALL_ONLY=true ;;
@@ -92,42 +84,13 @@ if [[ ! -f ${ISO:-} ]]; then
   exit 1
 fi
 
-if [[ $INSTALL_LANGUAGE != "en" && $INSTALL_LANGUAGE != "zh" ]]; then
-  echo "--language must be en or zh, not $INSTALL_LANGUAGE" >&2
-  exit 1
-fi
-if [[ $INSTALL_LANGUAGE == "zh" && $KEYBOARD_LABEL != "English (US)" ]]; then
-  echo "--language zh takes the preselected Pinyin keyboard; drop --keyboard" >&2
-  exit 1
-fi
-case "$KEYBOARD_LABEL" in
-  "English (US)" | "English (UK)" | "Japanese" | "Japanese (US keyboard)" | "Korean" | "Chinese (Simplified, Pinyin)" | "Chinese (Traditional, Zhuyin)") ;;
-  *) echo "The VM harness cannot type credentials with keyboard: $KEYBOARD_LABEL" >&2; exit 1 ;;
-esac
-
-omarchy-pkg-add qemu-full edk2-ovmf socat imagemagick tesseract tesseract-data-eng tesseract-data-chi_sim
-
-# After the language screen a Chinese install reads in Chinese.
-OCR_LANGS=eng
-[[ $INSTALL_LANGUAGE == "zh" ]] && OCR_LANGS=eng+chi_sim
-# lang_text <english> <chinese> picks the text a screen shows in this run.
-lang_text() {
-  if [[ $INSTALL_LANGUAGE == "zh" ]]; then
-    printf '%s' "$2"
-  else
-    printf '%s' "$1"
-  fi
-}
+omarchy-pkg-add qemu-full edk2-ovmf socat imagemagick tesseract tesseract-data-eng
 
 OVMF_CODE="/usr/share/edk2/x64/OVMF_CODE.4m.fd"
 OVMF_VARS_TEMPLATE="/usr/share/edk2/x64/OVMF_VARS.4m.fd"
 
 BASE_NAME="$(basename "$ISO" .iso)"
-if [[ $KEYBOARD_LABEL != "English (US)" ]]; then
-  BASE_NAME+="-$(printf '%s' "$KEYBOARD_LABEL" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g')"
-fi
 $ENCRYPT && BASE_NAME+="-encrypted"
-[[ $INSTALL_LANGUAGE == "zh" ]] && BASE_NAME+="-zh"
 $PROVISION && BASE_NAME+="-provision"
 BASE_DIR="$REPO_DIR/test-runs/$BASE_NAME"
 RUN_DIR="$BASE_DIR/runs/$(date +%Y%m%d-%H%M%S)"
@@ -277,13 +240,7 @@ ocr_screen() {
   screendump "$shot"
   [[ -s $shot ]] || return 0
   magick "$shot" -colorspace gray -negate -resize 150% "$prepped" 2>/dev/null || return 0
-  # The logo throws tesseract off CJK, so Chinese runs also read below it, without spaces.
-  if [[ $INSTALL_LANGUAGE == "zh" ]]; then
-    magick "$shot" -gravity north -chop 0x35% -colorspace gray -negate -resize 150% "$prepped.text.png" 2>/dev/null || return 0
-    { tesseract "$prepped" - --psm 6 -l "$OCR_LANGS"; tesseract "$prepped.text.png" - --psm 6 -l "$OCR_LANGS"; } 2>/dev/null | sed 'p; s/ //g' || true
-  else
-    tesseract "$prepped" - --psm 6 -l "$OCR_LANGS" 2>/dev/null || true
-  fi
+  tesseract "$prepped" - --psm 6 2>/dev/null || true
 }
 
 # Wait until the console shows the given text. Saves the offending screen as
@@ -653,35 +610,6 @@ audio-panel|meta_l-ctrl-a|omarchy-keyboard-panel|omarchy.audio'
 
 # ----------------------------------------------------- driving the installer
 
-select_keyboard() {
-  local label="$1" index direction="down"
-  # gum choose uses arrows, not a searchable text field. Read the same ordered
-  # choices the ISO vendors from the runtime rather than hard-code row numbers.
-  index=$(OMARCHY_TEST_KEYBOARD="$label" python - <<'PYTHON'
-import os, re
-from pathlib import Path
-source = Path(os.environ.get("OMARCHY_PATH", "")) / "install/provisioning/setup-form.sh"
-if not source.is_file():
-    raise SystemExit("Set OMARCHY_PATH to the source tree used to build this ISO")
-text = source.read_text()
-rows = re.search(r"OMARCHY_KEYBOARD_LAYOUTS=\$'(.*?)'\n", text, re.S).group(1).splitlines()
-labels = [row.split("|")[0] for row in rows]
-label = os.environ["OMARCHY_TEST_KEYBOARD"]
-if label not in labels:
-    raise SystemExit(f"Keyboard choice is absent from the ISO source: {label}")
-print(labels.index(label) - labels.index("English (US)"))
-PYTHON
-  ) || return 1
-  if (( index < 0 )); then
-    direction="up"
-    index=$((-index))
-  fi
-  for (( i = 0; i < index; i++ )); do
-    press "$direction"
-    sleep 0.1
-  done
-}
-
 drive_configurator() {
   log "Driving the installer wizard"
 
@@ -690,28 +618,23 @@ drive_configurator() {
   capture_console "success-installer-00-greeter"
   press ret
 
-  # Language comes first: English on top, Chinese below.
-  wait_for_screen "Select language" 300
-  capture_console "success-installer-01-language"
-  if [[ $INSTALL_LANGUAGE == "zh" ]]; then press end; else press home; fi
-  press ret
-
-  # The keyboard follows, for Chinese in cage + foot; Ctrl+C there defers provisioning.
-  wait_for_screen "$(lang_text "keyboard layout" "键盘布局")" 300
+  # Keyboard is the first screen. Ctrl+C there is the hidden entry into deferred provisioning
+  # mode; a normal install just selects the layout.
+  wait_for_screen "keyboard layout" 300
   capture_console "success-installer-01-keyboard-layout"
 
   if $PROVISION; then
     press ctrl-c # arm "prepare for another owner"
-    wait_for_screen "$(lang_text "another owner" "另一位")" 30
+    wait_for_screen "another owner" 30
     capture_console "success-installer-02-prepare-confirm"
     press ret # "Yes, prepare for another owner" is the affirmative default
 
     # Jumps straight to disk selection, then the overwrite confirm.
-    wait_for_screen "$(lang_text "install disk" "安装磁盘")" 60
+    wait_for_screen "install disk" 60
     capture_console "success-installer-03-prepare-install-disk"
     press ret
 
-    wait_for_screen "$(lang_text "recovery possible" "无法恢复")" 60
+    wait_for_screen "recovery possible" 60
     capture_console "success-installer-04-prepare-disk-warning-encrypted"
     if ! $ENCRYPT; then
       press ctrl-c
@@ -728,70 +651,58 @@ drive_configurator() {
     return 0
   fi
 
-  if [[ $KEYBOARD_LABEL != "English (US)" ]]; then
-    select_keyboard "$KEYBOARD_LABEL"
-    capture_console "success-installer-01-selected-keyboard"
-  fi
-  press ret
+  press ret # English (US) is preselected
 
   # Normal flow: user step comes before disk selection.
-  wait_for_screen "$(lang_text "Username" "用户名")" 120
+  wait_for_screen "Username" 120
   type_text "$GUEST_USER"
   capture_console "success-installer-02-username"
   press ret
 
-  wait_for_screen "$(lang_text "Password" "密码")" 60
+  wait_for_screen "Password" 60
   type_text "$GUEST_PASSWORD"
   capture_console "success-installer-03-password"
   press ret
 
-  wait_for_screen "$(lang_text "Must match" "确认")" 60
+  wait_for_screen "Must match" 60
   type_text "$GUEST_PASSWORD"
   capture_console "success-installer-04-password-confirmation"
   press ret
 
-  wait_for_screen "$(lang_text "Full name" "姓名")" 60
+  wait_for_screen "Full name" 60
   type_text "Omarchy Test"
   capture_console "success-installer-05-full-name"
   press ret
 
-  wait_for_screen "$(lang_text "Email address" "邮箱")" 60
-  type_text "test"
-  if [[ $KEYBOARD_LABEL == "Japanese" ]]; then
-    press bracket_left
-  elif [[ $KEYBOARD_LABEL == "English (UK)" ]]; then
-    press shift-apostrophe
-  else
-    press shift-2
-  fi
-  type_text "omarchy.org"
+  wait_for_screen "Email address" 60
+  type_text "test@omarchy.org"
   capture_console "success-installer-06-email"
   press ret
 
-  wait_for_screen "$(lang_text "Hostname" "主机名")" 60
+  wait_for_screen "Hostname" 60
   type_text "$GUEST_HOSTNAME"
   capture_console "success-installer-07-hostname"
   press ret
 
-  wait_for_screen "$(lang_text "Timezone" "时区")" 180 # tzupdate geo-guess can take a moment
+  wait_for_screen "Timezone" 180 # tzupdate geo-guess can take a moment
   capture_console "success-installer-08-timezone"
   press ret
 
-  wait_for_screen "$(lang_text "look right" "正确")" 60
+  wait_for_screen "look right" 60
   capture_console "success-installer-09-review"
   press ret
 
-  wait_for_screen "$(lang_text "install disk" "安装磁盘")" 60
+  wait_for_screen "install disk" 60
   capture_console "success-installer-10-install-disk"
   press ret # the single virtio disk
 
-  wait_for_screen "$(lang_text "installation mode\|recovery possible" "安装方式\|无法恢复")" 60
-  if ocr_screen | grep -qi "$(lang_text "installation mode" "安装方式")"; then
+  wait_for_screen "installation mode\|recovery possible" 60
+  if ocr_screen | grep -qi "installation mode"; then
     capture_console "success-installer-11-install-mode"
     press ret # "Full disk install" is preselected
   fi
 
-  wait_for_screen "$(lang_text "recovery possible" "无法恢复")" 60
+  wait_for_screen "recovery possible" 60
   capture_console "success-installer-12-disk-warning-encrypted"
   if ! $ENCRYPT; then
     press ctrl-c # toggles the confirm to the unencrypted flow
@@ -825,12 +736,8 @@ drive_provision_owner() {
   press ret
 
   wait_for_screen "keyboard layout" 120
-  if [[ $KEYBOARD_LABEL == "English (US)" ]]; then
-    press down # preserve the harness's default UK provisioning coverage
-  else
-    select_keyboard "$KEYBOARD_LABEL"
-  fi
-  capture_console "success-provision-01-keyboard-layout"
+  press down
+  capture_console "success-provision-01-keyboard-layout-uk"
   press ret
 
   wait_for_screen "Username" 120
@@ -856,13 +763,7 @@ drive_provision_owner() {
   # Shift+2 as on US); send that keycode so the typed email is correct under
   # the new layout — itself further proof the deferred keymap took effect.
   type_text "test"
-  if [[ $KEYBOARD_LABEL == "English (US)" || $KEYBOARD_LABEL == "English (UK)" ]]; then
-    press shift-apostrophe
-  elif [[ $KEYBOARD_LABEL == "Japanese" ]]; then
-    press bracket_left
-  else
-    press shift-2
-  fi
+  press shift-apostrophe
   type_text "omarchy.org"
   capture_console "success-provision-04-email"
   press ret
@@ -895,8 +796,7 @@ wait_for_install() {
   while true; do
     text=$(ocr_screen)
 
-    # OCR cannot read the Chinese reboot button, so Chinese runs match the title above it.
-    if grep -qi "$(lang_text "Reboot Now" "安装完成")" <<<"$text"; then
+    if grep -qi "Reboot Now" <<<"$text"; then
       log "Install finished. Confirming the reboot prompt."
       capture_console "success-installer-15-reboot"
       press ret
@@ -912,7 +812,7 @@ wait_for_install() {
       return 0
     fi
 
-    if grep -qi "$(lang_text "installation stopped" "安装已停止")" <<<"$text"; then
+    if grep -qi "installation stopped" <<<"$text"; then
       capture_console "failure-installer-installation-stopped"
       echo "Install failed — screenshot saved to $RUN_DIR" >&2
       return 1

builder/build-iso.sh

@@ -4,6 +4,11 @@ set -e
 
 OMARCHY_ISO_REF="${OMARCHY_ISO_REF:-quattro}"
 OMARCHY_MIRROR="${OMARCHY_MIRROR:-stable}"
+OMARCHY_REGION="${OMARCHY_REGION:-global}"
+case "$OMARCHY_REGION" in
+  global|cn) ;;
+  *) echo "Unsupported region: $OMARCHY_REGION" >&2; exit 1 ;;
+esac
 
 # Edge, dev, and local-source ISOs install the dev packages explicitly. Those
 # package recipes track the quattro branch. This avoids relying on pacman's
@@ -41,14 +46,11 @@ pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571
 pacman --config /configs/pacman-online-${OMARCHY_MIRROR}.conf --noconfirm -Sy omarchy-keyring
 pacman-key --populate omarchy
 
-# Put OPR first in the container too so makepkg resolves the same overrides
-# as the online installer configuration.
+# Append the [omarchy] repo to the container's /etc/pacman.conf so subsequent
+# tools (notably makepkg in build-omarchy-packages.sh) can resolve omarchy-
+# only build deps like limine-snapper-sync and limine-mkinitcpio-hook.
 if ! grep -q '^\[omarchy\]' /etc/pacman.conf; then
-  opr_section=$(awk '/^\[omarchy\]/,/^$/' /configs/pacman-online-${OMARCHY_MIRROR}.conf)
-  awk -v opr="$opr_section" '/^\[core\]/ { print opr; print "" } { print }' \
-    /etc/pacman.conf >/tmp/pacman-opr-first.conf
-  install -m 644 /tmp/pacman-opr-first.conf /etc/pacman.conf
-  rm -f /tmp/pacman-opr-first.conf
+  awk '/^\[omarchy\]/,/^$/' /configs/pacman-online-${OMARCHY_MIRROR}.conf >> /etc/pacman.conf
 fi
 
 # Build locations
@@ -70,6 +72,7 @@ cp -r /configs/* "$build_cache_dir/"
 mkdir -p "$build_cache_dir/airootfs/usr/share/omarchy-iso"
 echo "$OMARCHY_MIRROR" > "$build_cache_dir/airootfs/root/omarchy_mirror"
 echo "$OMARCHY_ISO_REF" > "$build_cache_dir/airootfs/root/omarchy_iso_ref"
+echo "$OMARCHY_REGION" > "$build_cache_dir/airootfs/root/omarchy_region"
 cat > "$build_cache_dir/airootfs/usr/share/omarchy-iso/package-targets" <<EOF
 OMARCHY_RUNTIME_PACKAGE=$OMARCHY_RUNTIME_PACKAGE
 OMARCHY_SETTINGS_PACKAGE=$OMARCHY_SETTINGS_PACKAGE
@@ -83,6 +86,7 @@ if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then
     echo "built_at=$(date -Is)"
     echo "ref=$OMARCHY_ISO_REF"
     echo "mirror=$OMARCHY_MIRROR"
+    echo "region=$OMARCHY_REGION"
     echo "runtime_package=$OMARCHY_RUNTIME_PACKAGE"
     echo "settings_package=$OMARCHY_SETTINGS_PACKAGE"
     echo "nvim_package=$OMARCHY_NVIM_PACKAGE"
@@ -121,8 +125,7 @@ cp "/tmp/$NODE_FILENAME" "$build_cache_dir/airootfs/opt/packages/"
 # The selected omarchy-settings package is needed here so its post_install hook
 # drops Omarchy's plymouthd.conf into /etc/plymouth before mkarchiso builds the
 # live initramfs.
-# cage and foot give Chinese installs a console that draws Chinese.
-arch_packages=(linux-t2 git gum jq openssl plymouth ttfx tzupdate omarchy-keyring "$OMARCHY_SETTINGS_PACKAGE" lvm2 cryptsetup parted cage foot)
+arch_packages=(linux-t2 git gum jq openssl plymouth ttfx tzupdate omarchy-keyring "$OMARCHY_SETTINGS_PACKAGE" lvm2 cryptsetup parted)
 printf '%s\n' "${arch_packages[@]}" >> "$build_cache_dir/packages.x86_64"
 
 # The live ISO boots linux-t2 (see airootfs/etc/mkinitcpio.d/linux-t2.preset), so
@@ -143,7 +146,7 @@ sed -i -E '/^(linux|broadcom-wl)$/d' "$build_cache_dir/packages.x86_64"
 # already in the mirror and we filter them out below. Without it, pacman -Syw
 # pulls the published omarchy* from the network mirror like any other package.
 if [[ -d /omarchy-source ]]; then
-  regions_source=/omarchy-source/default/regions
+  runtime_root=/omarchy-source
   base_pkg_lists=(/omarchy-source/install/omarchy-base.packages /omarchy-source/install/omarchy-other.packages)
   setup_form=/omarchy-source/install/provisioning/setup-form.sh
 else
@@ -160,23 +163,20 @@ else
   fi
   mkdir -p /tmp/omarchy-pkglists
   bsdtar -xf "$omarchy_pkg" -C /tmp/omarchy-pkglists usr/share/omarchy/install/omarchy-base.packages usr/share/omarchy/install/omarchy-other.packages
+  runtime_root=/tmp/omarchy-pkglists/usr/share/omarchy
+  if [[ $OMARCHY_REGION != "global" ]]; then
+    if ! bsdtar -xf "$omarchy_pkg" -C /tmp/omarchy-pkglists \
+      "usr/share/omarchy/default/regions/$OMARCHY_REGION" usr/share/omarchy/bin/omarchy-apply-pacman; then
+      echo "ERROR: runtime lacks region support; publish a matching runtime or use --local-source." >&2
+      exit 1
+    fi
+  fi
   base_pkg_lists=(/tmp/omarchy-pkglists/usr/share/omarchy/install/omarchy-base.packages /tmp/omarchy-pkglists/usr/share/omarchy/install/omarchy-other.packages)
   # Extracted on its own, tolerating a miss: bsdtar exits non-zero for a member
   # it can't find, so asking for this alongside the package lists would abort the
   # build here (set -e) with a bare "Not found in archive" instead of the
   # actionable error below.
   bsdtar -xf "$omarchy_pkg" -C /tmp/omarchy-pkglists usr/share/omarchy/install/provisioning/setup-form.sh 2>/dev/null || true
-  # Region profiles live under default/, which the settings package ships,
-  # not the runtime. Its own cache dir keeps the runtime lookup above from
-  # ever matching it.
-  settings_cache_dir="$bootstrap_cache_dir/settings"
-  mkdir -p "$settings_cache_dir"
-  pacman --config /configs/pacman-online-${OMARCHY_MIRROR}.conf --noconfirm -Syw "$OMARCHY_SETTINGS_PACKAGE" --cachedir "$settings_cache_dir" --dbpath /tmp/offlinedb-bootstrap >/dev/null
-  regions_source=$(find "$settings_cache_dir" -maxdepth 1 -type f -name "$OMARCHY_SETTINGS_PACKAGE-*.pkg.tar.zst" | sort | head -1)
-  if [[ -z $regions_source ]]; then
-    echo "ERROR: downloaded package for $OMARCHY_SETTINGS_PACKAGE not found in $settings_cache_dir" >&2
-    exit 1
-  fi
   setup_form=/tmp/omarchy-pkglists/usr/share/omarchy/install/provisioning/setup-form.sh
 fi
 
@@ -184,6 +184,15 @@ mkdir -p "$build_cache_dir/airootfs/usr/share/omarchy-iso"
 cp "${base_pkg_lists[0]}" "$build_cache_dir/airootfs/usr/share/omarchy-iso/omarchy-base.packages"
 cp "${base_pkg_lists[1]}" "$build_cache_dir/airootfs/usr/share/omarchy-iso/omarchy-other.packages"
 
+# Work on writable copies, leaving the mounted runtime and ISO configs intact.
+online_config=/tmp/omarchy-pacman-online.conf
+cp "/configs/pacman-online-${OMARCHY_MIRROR}.conf" "$online_config"
+bash /builder/prepare-region.sh "$OMARCHY_REGION" "$runtime_root" "$build_cache_dir/airootfs" "$online_config"
+base_pkg_lists=(
+  "$build_cache_dir/airootfs/usr/share/omarchy-iso/omarchy-base.packages"
+  "$build_cache_dir/airootfs/usr/share/omarchy-iso/omarchy-other.packages"
+)
+
 # The configurator's setup form comes from the runtime this ISO bundles, so the
 # installer and the first-boot setup that finishes a deferred install can never
 # disagree. A runtime predating the split ships no such file, which would leave
@@ -203,24 +212,6 @@ if [[ ! -f $setup_form ]]; then
 fi
 cp "$setup_form" "$build_cache_dir/airootfs/usr/share/omarchy-iso/setup-form.sh"
 
-# Every region's packages ride in the offline mirror, and its community
-# repositories join a writable copy of the online config to download them.
-online_config=/tmp/omarchy-pacman-online.conf
-cp "/configs/pacman-online-${OMARCHY_MIRROR}.conf" "$online_config"
-bash /builder/prepare-regions.sh "$regions_source" \
-  "$build_cache_dir/airootfs/usr/share/omarchy-iso" "$online_config"
-
-# Profiles ship in the settings package, but the finalizer that applies them
-# ships in the runtime. A runtime without it would ignore the region marker,
-# leaving regional targets with the keyring but none of the repositories.
-if [[ -n ${omarchy_pkg:-} && -d $build_cache_dir/airootfs/usr/share/omarchy-iso/regions ]]; then
-  runtime_listing=$(bsdtar -tf "$omarchy_pkg")
-  if ! grep -qx 'usr/bin/omarchy-apply-pacman' <<<"$runtime_listing"; then
-    echo "ERROR: $OMARCHY_SETTINGS_PACKAGE ships region profiles, but $OMARCHY_RUNTIME_PACKAGE lacks omarchy-apply-pacman to apply them." >&2
-    exit 1
-  fi
-fi
-
 # Collect every package we want available in the offline mirror.
 declare -a all_packages
 mapfile -t all_packages < <(
@@ -228,9 +219,6 @@ mapfile -t all_packages < <(
     cat "$build_cache_dir/packages.x86_64"
     grep -hv '^#\|^$' "${base_pkg_lists[@]}"
     grep -hv '^#\|^$' /builder/archinstall.packages
-    # Downloaded but not installed: the installer adds a region's packages
-    # only to targets in that region.
-    grep -hsv '^#\|^$' "$build_cache_dir"/airootfs/usr/share/omarchy-iso/regions/*/packages || true
     # Always include the selected Omarchy packages so the target install can
     # find the runtime and companion packages in the offline mirror.
     printf '%s\n' "$OMARCHY_RUNTIME_PACKAGE" "$OMARCHY_SETTINGS_PACKAGE" "$OMARCHY_NVIM_PACKAGE"

builder/prepare-region.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Add the selected runtime's regional payload to the ISO. Repository defaults
+# stay in the runtime package, not in a second set of ISO-specific templates.
+set -euo pipefail
+
+region="$1"
+runtime="$2"
+iso_root="$3"
+online_config="$4"
+
+case "$region" in
+  global) exit 0 ;;
+  cn) ;;
+  *) echo "Unsupported region: $region" >&2; exit 1 ;;
+esac
+
+profile="$runtime/default/regions/$region"
+if [[ ! -f $runtime/bin/omarchy-apply-pacman || ! -f $profile/packages ||
+      ! -f $profile/pacman/pacman.conf.append || ! -f $profile/pacman/mirrorlist.append ]]; then
+  echo "Runtime does not support region '$region'; publish a matching runtime or use --local-source." >&2
+  exit 1
+fi
+
+# This is the target package list used both for download resolution and by the
+# installer. Merely putting extra packages in the cache would not install them.
+payload="$iso_root/usr/share/omarchy-iso"
+cp -a "$profile" "$payload/region"
+printf '\n' >> "$payload/omarchy-base.packages"
+cat "$profile/packages" >> "$payload/omarchy-base.packages"
+
+# Only the community repository is needed for regional package downloads.
+# Keep the channel's build mirrors intact; target mirrors are restored later.
+printf '\n' >> "$online_config"
+cat "$profile/pacman/pacman.conf.append" >> "$online_config"
+
+# The keyring package must be signed by a key already trusted by Arch. Do not
+# bootstrap trust from an unchecked keyserver response or disable signatures.
+# https://github.com/archlinuxcn/repo#usage
+pacman --config "$online_config" --noconfirm -Sy --needed archlinuxcn-keyring
+pacman-key --populate archlinuxcn

builder/prepare-regions.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# Ship every region profile from the bundled runtime, so one ISO serves every
-# region. The installer picks a profile from the target's timezone; this only
-# stages the profiles and makes their packages downloadable. Repository
-# defaults stay in the runtime, not in a second set of ISO-specific templates.
-set -euo pipefail
-
-regions_source="$1"
-iso_payload="$2"
-online_config="$3"
-
-# The source is a checkout's default/regions, or the published settings
-# package that ships default/. One predating region profiles ships none; the
-# ISO then installs global targets only, exactly as before. Anything else that
-# fails here, such as an unreadable package, aborts the build.
-regions="$regions_source"
-if [[ -f $regions_source ]]; then
-  member=usr/share/omarchy/default/regions
-  listing=$(bsdtar -tf "$regions_source")
-  if grep -q "^$member/" <<<"$listing"; then
-    extracted=$(mktemp -d)
-    trap 'rm -rf "$extracted"' EXIT
-    bsdtar -xf "$regions_source" -C "$extracted" "$member"
-    regions="$extracted/$member"
-  fi
-fi
-if [[ ! -d $regions ]]; then
-  echo "Runtime ships no region profiles; every install will be global."
-  exit 0
-fi
-
-cp -a "$regions" "$iso_payload/regions"
-
-for profile in "$regions"/*/; do
-  # Only the community repositories are needed to download regional packages.
-  # Keep the channel's build mirrors intact; target mirrors are set later by
-  # the runtime's own pacman finalizer.
-  printf '\n' >> "$online_config"
-  cat "$profile/pacman/pacman.conf.append" >> "$online_config"
-
-  # Each keyring package must be signed by a key Arch already trusts. Do not
-  # bootstrap trust from an unchecked keyserver response or disable signatures.
-  # https://github.com/archlinuxcn/repo#usage
-  mapfile -t keyring_packages < <(grep -hv '^#\|^$' "$profile/packages" | grep -- '-keyring$' || true)
-  if (( ${#keyring_packages[@]} > 0 )); then
-    pacman --config "$online_config" --noconfirm -Sy --needed "${keyring_packages[@]}"
-    pacman-key --populate "${keyring_packages[@]%-keyring}"
-  fi
-done

configs/airootfs/root/.automated_script.sh

@@ -10,10 +10,7 @@
 #   - COLUMNS/LINES so gum picks up real terminal size
 set -euo pipefail
 
-[[ $(tty) == /dev/tty1 || -n ${OMARCHY_CJK_CONSOLE:-} ]] || exit 0
-if [[ -n ${OMARCHY_CJK_CONSOLE:-} ]]; then
-  touch "$XDG_RUNTIME_DIR/cjk-console-started"
-fi
+[[ $(tty) == /dev/tty1 ]] || exit 0
 
 export OMARCHY_MIRROR="$(cat /root/omarchy_mirror)"
 if [[ -f /root/omarchy_iso_ref ]]; then
@@ -42,8 +39,7 @@ set_tokyo_night_colors() {
   echo -en "\033[0m"
   clear
 }
-# foot sets the same palette from foot.ini; these escapes are VT-only.
-[[ -n ${OMARCHY_CJK_CONSOLE:-} ]] || set_tokyo_night_colors
+set_tokyo_night_colors
 
 mkdir -p /var/log
 touch "$OMARCHY_INSTALL_LOG_FILE"
@@ -94,16 +90,6 @@ warm_offline_mirror &
 warm_pid=$!
 trap 'kill "$warm_pid" 2>/dev/null' EXIT
 
-# The CJK console's font comes from the offline mirror's noto-fonts-cjk, not the live image.
-unpack_cjk_font() {
-  local packages=(/var/cache/omarchy/mirror/offline/noto-fonts-cjk-*.pkg.tar.zst)
-  if ((${#packages[@]} != 1)) || [[ ! -f ${packages[0]} ]]; then
-    echo "Expected one noto-fonts-cjk package in the offline mirror, found: ${packages[*]}" >&2
-    return 1
-  fi
-  bsdtar -xf "${packages[0]}" -C / usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc
-}
-
 cd /root
 # Autoinstall: a cidata drive carrying the configurator's own output files
 # stands in for the wizard. omarchy-cidata-load copies them into /root and
@@ -112,43 +98,7 @@ if /usr/local/bin/omarchy-cidata-load; then
   echo "Autoinstall configuration found on cidata drive; skipping the configurator."
   export OMARCHY_UI_INTERACTIVE=no
 else
-  # Chinese moves to cage + foot, which draw Chinese; English moves back to the VT, which applies keymaps.
-  cjk_relaunch=10
-  vt_return=11
-  if [[ -n ${OMARCHY_CJK_CONSOLE:-} ]]; then
-    export OMARCHY_VT_RETURN=$vt_return
-  elif command -v cage >/dev/null; then
-    export OMARCHY_CJK_RELAUNCH=$cjk_relaunch
-  fi
-  ./configurator && status=0 || status=$?
-  while ((status == cjk_relaunch)); do
-    cjk_runtime=/run/omarchy-cjk-console
-    mkdir -p -m 700 "$cjk_runtime"
-    rm -f "$cjk_runtime/cjk-console-started" "$cjk_runtime/return-to-vt"
-    if ! unpack_cjk_font; then
-      echo "The Chinese font could not be unpacked from the offline mirror; continuing in English."
-      unset OMARCHY_CJK_RELAUNCH
-      OMARCHY_INSTALL_LANGUAGE=zh ./configurator && status=0 || status=$?
-      continue
-    fi
-    cage_status=0
-    env -u OMARCHY_CJK_RELAUNCH XDG_RUNTIME_DIR=$cjk_runtime OMARCHY_CJK_CONSOLE=1 OMARCHY_INSTALL_LANGUAGE=zh \
-      LANG=C.UTF-8 WLR_RENDERER=pixman cage -- foot -c /usr/share/omarchy-iso/foot.ini "$0" || cage_status=$?
-    if [[ -f $cjk_runtime/return-to-vt ]]; then
-      OMARCHY_INSTALL_LANGUAGE=en ./configurator && status=0 || status=$?
-    elif [[ -f $cjk_runtime/cjk-console-started ]]; then
-      exit "$cage_status"
-    else
-      echo "The Chinese console could not start (cage exit $cage_status); continuing in English."
-      unset OMARCHY_CJK_RELAUNCH
-      OMARCHY_INSTALL_LANGUAGE=zh ./configurator && status=0 || status=$?
-    fi
-  done
-  if [[ -n ${OMARCHY_CJK_CONSOLE:-} ]] && ((status == vt_return)); then
-    touch "$XDG_RUNTIME_DIR/return-to-vt"
-    exit 0
-  fi
-  ((status == 0)) || exit "$status"
+  ./configurator
 fi
 
 # Deferred-provisioning installs skip the celebration/reboot prompt and reboot on
@@ -161,11 +111,6 @@ if [[ -f /root/defer-provisioning ]] ||
   export OMARCHY_UI_DEFER_PROVISIONING=yes
 fi
 
-# Only Chinese reaches the install from the CJK console; English returns to the VT.
-if [[ -n ${OMARCHY_CJK_CONSOLE:-} ]]; then
-  export OMARCHY_INSTALL_LANG=zh
-fi
-
 # The foreground dashboard is now the sole visible install UI owner. It starts
 # the actual installer as a non-interactive child, logs child output, waits for
 # completion, then renders the final installed-time/reboot prompt itself.

configs/airootfs/root/configurator

@@ -24,71 +24,15 @@ if [[ ! -r $SETUP_FORM ]]; then
 fi
 source "$SETUP_FORM"
 
-# Chinese text for OMARCHY_INSTALL_LANG=zh; disk-step failures stay English for support logs.
-OMARCHY_ZH+=(
-  ["Aborted installation"]="安装已中止"
-  ["You can retry later by running: ./.automated_script.sh"]="稍后可运行 ./.automated_script.sh 重试"
-  ["Let's setup your machine..."]="开始设置这台机器……"
-  ["Press Ctrl+C to prepare this machine for another owner."]="按 Ctrl+C 为另一位使用者准备这台机器。"
-  ["This prepares the machine for another owner."]="这会为另一位使用者准备这台机器。"
-  ["The system installs now, but setup is delayed until first boot."]="系统现在安装，设置留到首次开机。"
-  ["Yes, prepare for another owner"]="是，为他人准备"
-  ["No, keep setting up"]="否，继续设置"
-  ["Prepare this machine for another owner?"]="为另一位使用者准备这台机器？"
-  ["Let's setup your user account..."]="开始设置用户账户……"
-  ["Field"]="项目"
-  ["Value"]="值"
-  ["Username"]="用户名"
-  ["Password"]="密码"
-  ["Full name"]="姓名"
-  ["Email address"]="邮箱"
-  ["Hostname"]="主机名"
-  ["Keyboard"]="键盘"
-  ["Region"]="区域"
-  ["[Skipped]"]="[已跳过]"
-  ["Yes"]="是"
-  ["No, change it"]="否，去修改"
-  ["Does this look right?"]="以上信息正确吗？"
-  ["Not enough free space on %s"]="%s 的空闲空间不足"
-  ["%s has %s of usable free space; Omarchy needs at least 32GB."]="%s 有 %s 可用空闲空间；Omarchy 至少需要 32GB。"
-  ["Open the partition tool to free at least 32GB on %s, then try again."]="打开分区工具，在 %s 上腾出至少 32GB，然后重试。"
-  ["Back"]="返回"
-  ["Open partition tool"]="打开分区工具"
-  ["Return to installation mode?"]="返回安装方式选择？"
-  ["Checking for BitLocker on %s"]="检查 %s 上的 BitLocker"
-  ["BitLocker signature detected on %s."]="在 %s 上发现 BitLocker 签名。"
-  ["Turn BitLocker off in Windows and wait for the drive to finish decrypting, then try again."]="在 Windows 中关闭 BitLocker，等磁盘解密完成后重试。"
-  ["Suspending BitLocker is not enough — the drive stays encrypted."]="只暂停 BitLocker 不够，磁盘仍是加密的。"
-  ["Aborted: BitLocker is enabled on this disk."]="已中止：这块磁盘开启了 BitLocker。"
-  ["Checking existing EFI partitions on %s"]="检查 %s 上已有的 EFI 分区"
-  ["Found a Windows ESP at %s — leaving it untouched."]="在 %s 发现 Windows ESP，保持不动。"
-  ["Omarchy will create its own dedicated EFI partition in free space."]="Omarchy 会在空闲空间中创建自己的 EFI 分区。"
-  ["A new EFI partition will be created in free space."]="会在空闲空间中新建 EFI 分区。"
-  ["Analyzing free space on %s"]="分析 %s 的空闲空间"
-  ["Install Omarchy in the %s of free space."]="在 %s 空闲空间中安装 Omarchy。"
-  ["Press Ctrl+C for unencrypted install."]="按 Ctrl+C 改为不加密安装。"
-  ["Yes, install"]="是，开始安装"
-  ["Yes, install without encryption"]="是，不加密安装"
-  ["Confirm installing on %s"]="确认安装到 %s"
-  ["Creating partitions on %s"]="在 %s 上创建分区"
-  ["Setting up LUKS2 on %s"]="在 %s 上设置 LUKS2 加密"
-  ["Creating Btrfs filesystem and subvolumes"]="创建 Btrfs 文件系统和子卷"
-  ["Let's select where to install Omarchy..."]="选择 Omarchy 的安装位置……"
-  ["Select install disk"]="选择安装磁盘"
-  ["Partition tool for %s"]="%s 的分区工具"
-  ["Create unallocated free space for Omarchy, then write changes and quit."]="为 Omarchy 腾出未分配空间，然后写入更改并退出。"
-  ["Do not create an Omarchy partition here — leave the target area as Free space."]="不要在这里创建 Omarchy 分区，目标区域保持为 Free space。"
-  ["Tip: free-space install needs at least 32GB unallocated, plus 2GB more if no ESP already exists."]="提示：空闲空间安装至少需要 32GB 未分配空间；没有 ESP 时再加 2GB。"
-  ["Open cfdisk"]="打开 cfdisk"
-  ["Open partition tool for %s?"]="打开 %s 的分区工具？"
-  ["Full disk install"]="整盘安装"
-  ["Free space install (alongside existing data)"]="空闲空间安装（保留现有数据）"
-  ["Choose a different disk"]="换一块磁盘"
-  ["Let's select how to install Omarchy..."]="选择 Omarchy 的安装方式……"
-  ["Select installation mode on %s"]="选择 %s 上的安装方式"
-  ["Everything will be overwritten. There is no recovery possible."]="磁盘上的一切都会被覆盖，无法恢复。"
-  ["Confirm overwriting %s"]="确认覆盖 %s"
-)
+# A regional ISO carries its profile here (builder/prepare-region.sh copies it);
+# the form preselects the profile's timezone when there is no geo guess, which
+# is every offline install.
+REGION_TIMEZONE="${REGION_TIMEZONE:-/usr/share/omarchy-iso/region/timezone}"
+region_timezone() {
+  if [[ -r $REGION_TIMEZONE ]]; then
+    head -n 1 "$REGION_TIMEZONE"
+  fi
+}
 
 # Partition creation helpers, shared with test/partition-numbering-test.sh so
 # the numbering logic can be exercised without a real disk.
@@ -242,9 +186,9 @@ greeter() {
 }
 
 abort() {
-  gum style "${1:-$(omarchy_text "Aborted installation")}"
+  gum style "${1:-Aborted installation}"
   echo
-  gum style "$(omarchy_text "You can retry later by running: ./.automated_script.sh")"
+  gum style "You can retry later by running: ./.automated_script.sh"
   exit 1
 }
 
@@ -269,30 +213,6 @@ notice() {
 
 # STEP 1: KEYBOARD LAYOUT
 
-# The target's LANG follows the language picked on the first screen.
-target_lang() {
-  if [[ $language == "zh" ]]; then
-    echo zh_CN.UTF-8
-  else
-    echo en_US.UTF-8
-  fi
-}
-
-# .automated_script.sh moves Chinese into the CJK console and English back to the VT, which applies keymaps.
-apply_language() {
-  if [[ $language == "zh" && -n ${OMARCHY_CJK_RELAUNCH:-} ]]; then
-    exit "$OMARCHY_CJK_RELAUNCH"
-  fi
-  if [[ $language == "en" && -n ${OMARCHY_VT_RETURN:-} ]]; then
-    exit "$OMARCHY_VT_RETURN"
-  fi
-  if [[ $language == "zh" && -n ${OMARCHY_CJK_CONSOLE:-} ]]; then
-    export OMARCHY_INSTALL_LANG=zh
-  else
-    unset OMARCHY_INSTALL_LANG
-  fi
-}
-
 keyboard_form() {
   # Ctrl+C is the hidden entry into deferred provisioning, offered on every
   # visit: the user step unwinds back here and nothing is on disk yet. Callers
@@ -302,24 +222,11 @@ keyboard_form() {
   while true; do
     clear_logo
     echo
-    say "$(omarchy_text "Let's setup your machine...")"
-    say --foreground 8 "$(omarchy_text "Press Ctrl+C to prepare this machine for another owner.")"
+    say "Let's setup your machine..."
+    say --foreground 8 "Press Ctrl+C to prepare this machine for another owner."
     echo
 
-    status=0
-    if ! $language_chosen; then
-      omarchy_prompt_language && status=0 || status=$?
-      ((status == 0)) && apply_language
-    fi
-    # Esc, Ctrl+C or a later "No, change it" asks the language again.
-    language_chosen=false
-    if ((status == 0)); then
-      local layouts=$OMARCHY_KEYBOARD_LAYOUTS selected="English (US)"
-      [[ $language == "zh" ]] && selected="Chinese (Simplified, Pinyin)"
-      # cage keeps its US layout, so the CJK console offers only US-keymap keyboards.
-      [[ -n ${OMARCHY_CJK_CONSOLE:-} ]] && layouts=$(awk -F'|' '$2 == "us"' <<<"$layouts")
-      OMARCHY_KEYBOARD_LAYOUTS=$layouts omarchy_prompt_keyboard "$selected" && status=0 || status=$?
-    fi
+    omarchy_prompt_keyboard && status=0 || status=$?
     ((status == 0)) && break
 
     # Esc means "back", and nothing precedes the first screen, so re-ask.
@@ -348,11 +255,11 @@ keyboard_form() {
 confirm_prepare_for_another_owner() {
   clear_logo
   echo
-  say "$(omarchy_text "This prepares the machine for another owner.")"
-  say --foreground 8 "$(omarchy_text "The system installs now, but setup is delayed until first boot.")"
+  say "This prepares the machine for another owner."
+  say --foreground 8 "The system installs now, but setup is delayed until first boot."
   echo
-  gum confirm --affirmative "$(omarchy_text "Yes, prepare for another owner")" --negative "$(omarchy_text "No, keep setting up")" \
-    "$(omarchy_text "Prepare this machine for another owner?")"
+  gum confirm --affirmative "Yes, prepare for another owner" --negative "No, keep setting up" \
+    "Prepare this machine for another owner?"
 }
 
 # The user step. Deferred-provisioning installs skip it entirely — the machine's first owner
@@ -360,7 +267,7 @@ confirm_prepare_for_another_owner() {
 # operator sets nothing user-specific.
 
 user_form() {
-  step "$(omarchy_text "Let's setup your user account...")"
+  step "Let's setup your user account..."
 
   # Each prompt reports 0 (set), OMARCHY_FORM_BACK (Esc), or OMARCHY_FORM_SIGNAL
   # (Ctrl+C). Both non-zero cases unwind to user_step, which decides what they
@@ -373,7 +280,7 @@ user_form() {
 
   omarchy_prompt_identity || return $?
   omarchy_prompt_hostname || return $?
-  omarchy_prompt_timezone || return $?
+  omarchy_prompt_timezone "$(region_timezone)" || return $?
 }
 
 # Returns 0 on confirmed account details, or as soon as the keyboard screen
@@ -393,29 +300,19 @@ user_step() {
       continue
     fi
 
-    # The timezone selects the region (mirrors and repositories), using the
-    # same lookup as the orchestrator. Global installs get no extra row.
-    region=$(cd /usr/share/omarchy-iso 2>/dev/null && python -m orchestrator.region "$timezone") || region="global"
-    region_row=""
-    if [[ $region != "global" ]]; then
-      region_row="\n$(omarchy_text Region),$region"
-    fi
-
     # Add manual padding since gum table -p doesn't respect padding
-    local skipped
-    skipped=$(omarchy_text "[Skipped]")
-    echo -e "$(omarchy_text Field),$(omarchy_text Value)
-$(omarchy_text Username),$username
-$(omarchy_text Password),$(printf "%${#password}s" | tr ' ' '*')
-$(omarchy_text "Full name"),${full_name:-$skipped}
-$(omarchy_text "Email address"),${email_address:-$skipped}
-$(omarchy_text Hostname),$hostname
-$(omarchy_text Timezone),$timezone$region_row
-$(omarchy_text Keyboard),\"$keyboard_label\"" |
+    echo -e "Field,Value
+Username,$username
+Password,$(printf "%${#password}s" | tr ' ' '*')
+Full name,${full_name:-[Skipped]}
+Email address,${email_address:-[Skipped]}
+Hostname,$hostname
+Timezone,$timezone
+Keyboard,$keyboard" |
       gum table -s "," -p | sed "s/^/${PADDING_LEFT_SPACES}/"
 
     echo
-    if gum confirm --affirmative "$(omarchy_text "Yes")" --negative "$(omarchy_text "No, change it")" "$(omarchy_text "Does this look right?")"; then
+    if gum confirm --negative "No, change it" "Does this look right?"; then
       break
     else
       keyboard_form
@@ -617,11 +514,11 @@ print_dry_run_files() {
 # action so users have a way to actually fix the situation.
 not_enough_space() {
   local available="${1:-0}"
-  step "$(omarchy_text "Not enough free space on %s" "$disk")"
-  say --foreground 1 "$(omarchy_text "%s has %s of usable free space; Omarchy needs at least 32GB." "$disk" "$(to_gb $available)")"
-  say "$(omarchy_text "Open the partition tool to free at least 32GB on %s, then try again." "$disk")"
+  step "Not enough free space on $disk"
+  say --foreground 1 "$disk has $(to_gb $available) of usable free space; Omarchy needs at least 32GB."
+  say "Open the partition tool to free at least 32GB on $disk, then try again."
   echo
-  if ! gum confirm --affirmative "$(omarchy_text "Back")" --negative "$(omarchy_text "Open partition tool")" "$(omarchy_text "Return to installation mode?")"; then
+  if ! gum confirm --affirmative "Back" --negative "Open partition tool" "Return to installation mode?"; then
     open_partition_tool
   fi
   return 1
@@ -631,14 +528,14 @@ not_enough_space() {
 # encryption confirm. Sets the globals run_partition_execute needs. Returns 1
 # to fall back to the install-mode picker.
 run_partition_decide() {
-  step "$(omarchy_text "Checking for BitLocker on %s" "$disk")"
+  step "Checking for BitLocker on $disk"
   local bl_part
   bl_part=$(detect_bitlocker || true)
   if [[ -n "$bl_part" ]]; then
-    say --foreground 1 "$(omarchy_text "BitLocker signature detected on %s." "$bl_part")"
-    say "$(omarchy_text "Turn BitLocker off in Windows and wait for the drive to finish decrypting, then try again.")"
-    say "$(omarchy_text "Suspending BitLocker is not enough — the drive stays encrypted.")"
-    abort "$(omarchy_text "Aborted: BitLocker is enabled on this disk.")"
+    say --foreground 1 "BitLocker signature detected on $bl_part."
+    say "Turn BitLocker off in Windows and wait for the drive to finish decrypting, then try again."
+    say "Suspending BitLocker is not enough — the drive stays encrypted."
+    abort "Aborted: BitLocker is enabled on this disk."
   fi
 
   # Omarchy always creates its own dedicated ESP in free space and never
@@ -647,17 +544,17 @@ run_partition_decide() {
   # Windows ESP is far too small for our Unified Kernel Images, and a shared
   # ESP forces the install unencrypted. A separate Linux ESP keeps Windows
   # and Omarchy fully isolated and keeps LUKS on the table.
-  step "$(omarchy_text "Checking existing EFI partitions on %s" "$disk")"
+  step "Checking existing EFI partitions on $disk"
   local detected_win_esp
   detected_win_esp=$(detect_windows_esp || true)
   if [[ -n "$detected_win_esp" ]]; then
-    say "$(omarchy_text "Found a Windows ESP at %s — leaving it untouched." "$detected_win_esp")"
-    say "$(omarchy_text "Omarchy will create its own dedicated EFI partition in free space.")"
+    say "Found a Windows ESP at $detected_win_esp — leaving it untouched."
+    say "Omarchy will create its own dedicated EFI partition in free space."
   else
-    say "$(omarchy_text "A new EFI partition will be created in free space.")"
+    say "A new EFI partition will be created in free space."
   fi
 
-  step "$(omarchy_text "Analyzing free space on %s" "$disk")"
+  step "Analyzing free space on $disk"
   partprobe "$disk" 2>/dev/null || true
   sleep 1
 
@@ -732,21 +629,21 @@ run_partition_decide() {
   while true; do
     clear_logo
     echo
-    say "$(omarchy_text "Install Omarchy in the %s of free space." "$(to_gb $INSTALL_MAX_B)")"
+    say "Install Omarchy in the $(to_gb $INSTALL_MAX_B) of free space."
 
     case $mode in
       encrypted)
-        say --foreground 8 "$(omarchy_text "Press Ctrl+C for unencrypted install.")"
-        affirmative="$(omarchy_text "Yes, install")"
+        say --foreground 8 "Press Ctrl+C for unencrypted install."
+        affirmative="Yes, install"
         ;;
       unencrypted)
-        affirmative="$(omarchy_text "Yes, install without encryption")"
+        affirmative="Yes, install without encryption"
         ;;
     esac
     echo
 
-    gum confirm --affirmative "$affirmative" --negative "$(omarchy_text "No, change it")" \
-      "$(omarchy_text "Confirm installing on %s" "$disk")"
+    gum confirm --affirmative "$affirmative" --negative "No, change it" \
+      "Confirm installing on $disk"
     confirm_status=$?
 
     case $confirm_status in
@@ -804,7 +701,7 @@ run_partition_execute() {
     say "[dry] partition numbers are assigned by parted at creation, then read back"
     say "[dry] encrypted=$encrypt_installation kernel=$kernel_choice"
   else
-    step "$(omarchy_text "Creating partitions on %s" "$disk")"
+    step "Creating partitions on $disk"
     if $needs_mklabel; then
       disk_step "initializing GPT on $disk" parted --script "$disk" mklabel gpt
       partprobe "$disk" 2>/dev/null || true
@@ -842,7 +739,7 @@ run_partition_execute() {
     disk_step "clearing stale signatures on $root_partition_device" wipefs -af "$root_partition_device"
 
     if [[ "$encrypt_installation" == "true" ]]; then
-      step "$(omarchy_text "Setting up LUKS2 on %s" "$root_partition_device")"
+      step "Setting up LUKS2 on $root_partition_device"
       # Kept as pipes rather than routed through disk_step: the passphrase must
       # not become an argv the process table can show. Folding stderr into
       # stdout still lands any error in the install log.
@@ -859,7 +756,7 @@ run_partition_execute() {
       root_mapper="$root_partition_device"
     fi
 
-    step "$(omarchy_text "Creating Btrfs filesystem and subvolumes")"
+    step "Creating Btrfs filesystem and subvolumes"
     disk_step "creating the Btrfs filesystem on $root_mapper" \
       mkfs.btrfs -f -L OMARCHY "$root_mapper"
     wait_for_device "$root_mapper" || disk_abort_hook "Root device $root_mapper never appeared"
@@ -913,8 +810,6 @@ run_partition_execute() {
     "bootloader_config": { "bootloader": "Limine", "uki": false, "removable": false },
     "custom_commands": [],
     "omarchy_install": {
-        "input_method": "${keyboard_input_method:-none}",
-        "input_xkb_layout": "${keyboard_xkb_layout:-}",
         "mode": "protected",
         "target_mount": "/mnt",
         "boot": {
@@ -947,7 +842,7 @@ run_partition_execute() {
     "locale_config": {
         "kb_layout": "$keyboard",
         "sys_enc": "UTF-8",
-        "sys_lang": "$(target_lang)"
+        "sys_lang": "en_US.UTF-8"
     },
     "mirror_config": {
         "custom_repositories": [],
@@ -977,7 +872,7 @@ _EOF_
 }
 
 disk_form() {
-  step "$(omarchy_text "Let's select where to install Omarchy...")"
+  step "Let's select where to install Omarchy..."
 
   # Don't offer the install media as an option (Arch ISO mounts it here)
   local boot_source
@@ -1003,19 +898,19 @@ disk_form() {
     fi
   done <<<"$available_disks"
 
-  selected_display=$(echo "$disk_options" | gum choose --header "$(omarchy_text "Select install disk")") || abort
+  selected_display=$(echo "$disk_options" | gum choose --header "Select install disk") || abort
   disk=$(echo "$selected_display" | awk '{print $1}')
 }
 
 # STEP 4: INSTALL MODE
 
 open_partition_tool() {
-  step "$(omarchy_text "Partition tool for %s" "$disk")"
-  gum style "$(omarchy_text "Create unallocated free space for Omarchy, then write changes and quit.")"
-  gum style --foreground 8 "$(omarchy_text "Do not create an Omarchy partition here — leave the target area as Free space.")"
-  gum style --foreground 8 "$(omarchy_text "Tip: free-space install needs at least 32GB unallocated, plus 2GB more if no ESP already exists.")"
+  step "Partition tool for $disk"
+  gum style "Create unallocated free space for Omarchy, then write changes and quit."
+  gum style --foreground 8 "Do not create an Omarchy partition here — leave the target area as Free space."
+  gum style --foreground 8 "Tip: free-space install needs at least 32GB unallocated, plus 2GB more if no ESP already exists."
   echo
-  gum confirm --affirmative "$(omarchy_text "Open cfdisk")" --negative "$(omarchy_text "Back")" "$(omarchy_text "Open partition tool for %s?" "$disk")" || return 0
+  gum confirm --affirmative "Open cfdisk" --negative "Back" "Open partition tool for $disk?" || return 0
 
   clear
   cfdisk "$disk" || true
@@ -1048,17 +943,17 @@ requires_full_disk_install() {
 }
 
 install_mode_form() {
-  local choices=("$(omarchy_text "Full disk install")")
+  local choices=("Full disk install")
 
   # The free-space/protected path registers an EFI boot entry and is UEFI-only.
   # Full-disk installs still support BIOS through the orchestrator's BIOS branch.
   if [[ -d /sys/firmware/efi ]] && ! $full_disk_only; then
-    choices+=("$(omarchy_text "Free space install (alongside existing data)")")
+    choices+=("Free space install (alongside existing data)")
   fi
-  choices+=("$(omarchy_text "Choose a different disk")")
+  choices+=("Choose a different disk")
 
-  step "$(omarchy_text "Let's select how to install Omarchy...")"
-  install_mode=$(gum choose --header "$(omarchy_text "Select installation mode on %s" "$disk")" "${choices[@]}") || abort
+  step "Let's select how to install Omarchy..."
+  install_mode=$(gum choose --header "Select installation mode on $disk" "${choices[@]}") || abort
 }
 
 confirm_disk_overwrite() {
@@ -1068,17 +963,17 @@ confirm_disk_overwrite() {
   while true; do
     clear_logo
     echo
-    say "$(omarchy_text "Everything will be overwritten. There is no recovery possible.")"
+    say "Everything will be overwritten. There is no recovery possible."
 
     if [[ $mode == "encrypted" ]]; then
-      say --foreground 8 "$(omarchy_text "Press Ctrl+C for unencrypted install.")"
-      affirmative="$(omarchy_text "Yes, install")"
+      say --foreground 8 "Press Ctrl+C for unencrypted install."
+      affirmative="Yes, install"
     else
-      affirmative="$(omarchy_text "Yes, install without encryption")"
+      affirmative="Yes, install without encryption"
     fi
 
     echo
-    gum confirm --affirmative "$affirmative" --negative "$(omarchy_text "No, change it")" "$(omarchy_text "Confirm overwriting %s" "$disk")"
+    gum confirm --affirmative "$affirmative" --negative "No, change it" "Confirm overwriting ${disk}"
     confirm_status=$?
 
     case $confirm_status in
@@ -1117,13 +1012,13 @@ select_installation() {
     # With no free-space option to offer, a full-disk install is the only
     # mode, so skip the picker and go straight to the overwrite confirm.
     if $full_disk_only; then
-      install_mode=$(omarchy_text "Full disk install")
+      install_mode="Full disk install"
     else
       install_mode_form
     fi
 
     case "$install_mode" in
-      "$(omarchy_text "Full disk install")")
+      "Full disk install")
         if confirm_disk_overwrite; then
           install_target="full_disk"
           return 0
@@ -1132,13 +1027,13 @@ select_installation() {
         # wants a different disk.
         $full_disk_only && disk_form
         ;;
-      "$(omarchy_text "Free space install (alongside existing data)")")
+      "Free space install"*)
         if run_partition_decide; then
           install_target="free_space"
           return 0
         fi
         ;;
-      "$(omarchy_text "Choose a different disk")")
+      "Choose a different disk")
         disk_form
         ;;
     esac
@@ -1149,20 +1044,12 @@ select_installation() {
 
 defer_provisioning=false
 install_target="full_disk"
-# A rerun arrives with the language chosen; otherwise English.
-language="${OMARCHY_INSTALL_LANGUAGE:-en}"
-language_chosen=false
 
 # Let the live VT reach its settled width before the first screen so the logo
 # isn't measured against the transient 80-column boot console.
 wait_for_stable_terminal
 
-if [[ -n ${OMARCHY_INSTALL_LANGUAGE:-} ]]; then
-  apply_language
-  language_chosen=true
-else
-  greeter
-fi
+greeter
 
 keyboard_form
 
@@ -1179,8 +1066,6 @@ if $defer_provisioning; then
   # their real layout in the OOBE, which re-keys the console and, on encrypted
   # installs, rebuilds the initramfs so the LUKS prompt matches.
   keyboard="us"
-  keyboard_input_method="none"
-  keyboard_xkb_layout=""
   username=""
   password=""
   password_hash=""
@@ -1263,8 +1148,6 @@ cat <<-_EOF_ >user_configuration.json
     "bootloader_config": { "bootloader": "Limine", "uki": false, "removable": false },
     "custom_commands": [],
     "omarchy_install": {
-        "input_method": "${keyboard_input_method:-none}",
-        "input_xkb_layout": "${keyboard_xkb_layout:-}",
         "mode": "full_disk",
         "defer_provisioning": $defer_provisioning,
         "target_mount": "/mnt",
@@ -1348,7 +1231,7 @@ cat <<-_EOF_ >user_configuration.json
     "locale_config": {
         "kb_layout": "$keyboard",
         "sys_enc": "UTF-8",
-        "sys_lang": "$(target_lang)"
+        "sys_lang": "en_US.UTF-8"
     },
     "mirror_config": {
         "custom_repositories": [],

configs/airootfs/usr/local/bin/omarchy-install-dashboard

@@ -88,81 +88,6 @@ tips=(
   "Keep the system fresh with Update in the Omarchy menu"
 )
 
-# omarchy_text and its Chinese table come from the setup form the configurator uses.
-SETUP_FORM="${SETUP_FORM:-/usr/share/omarchy-iso/setup-form.sh}"
-[[ -r $SETUP_FORM ]] || SETUP_FORM="${OMARCHY_PATH:-/usr/share/omarchy}/install/provisioning/setup-form.sh"
-source "$SETUP_FORM"
-OMARCHY_ZH+=(
-  ["Tip: %s"]="提示：%s"
-  ["Installed Omarchy"]="Omarchy 安装完成"
-  ["Installed Omarchy in %s"]="Omarchy 安装完成，用时 %s"
-  ["Reboot Now"]="立即重启"
-  ["Last log lines:"]="日志末尾："
-  ["Last target log lines:"]="目标系统日志末尾："
-  ["Press Enter to continue…"]="按回车继续……"
-  ["No log uploader is available in this environment."]="这个环境没有日志上传工具。"
-  ["Install log: %s"]="安装日志：%s"
-  ["Target log: %s"]="目标系统日志：%s"
-  ["Omarchy installation stopped"]="Omarchy 安装已停止"
-  ["Installer exited with status %s"]="安装程序退出，状态码 %s"
-  ["Get help at https://omarchy.org/discord"]="求助：https://omarchy.org/discord"
-  ["What would you like to do?"]="接下来做什么？"
-  ["Upload log for support"]="上传日志求助"
-  ["View full log"]="查看完整日志"
-  ["Drop to shell"]="进入 shell"
-  ["Reboot"]="重启"
-  ["Power off"]="关机"
-  ["The install medium was misread"]="安装介质读取出错"
-  ["This package is intact on this ISO, so the download and the write were fine:"]="这个软件包在 ISO 中完好，下载和写入都没有问题："
-  ["Try another USB port or another stick, and test this machine's memory"]="换一个 USB 口或换一个 U 盘，并检测这台机器的内存"
-  ["The install medium is damaged"]="安装介质已损坏"
-  ["This package no longer matches the checksum it was built with:"]="这个软件包和构建时的校验和不再一致："
-  ["Re-download the ISO, verify it with sha256sum, and write the USB again"]="重新下载 ISO，用 sha256sum 校验，再重新写入 U 盘"
-  ["If a verified ISO fails here too, the USB stick itself is the problem"]="如果校验过的 ISO 在这里也失败，问题出在 U 盘本身"
-  ["The install medium is damaged or misread"]="安装介质已损坏或读取出错"
-  ["pacman rejected this package, read straight off this ISO:"]="pacman 拒绝了这个直接从 ISO 读出的软件包："
-  ["Verify your download with sha256sum, then write the USB again"]="用 sha256sum 校验下载的文件，再重新写入 U 盘"
-  ["If the download verifies, the stick or this machine's memory is at fault"]="如果下载校验无误，问题出在 U 盘或这台机器的内存"
-)
-
-if [[ ${OMARCHY_INSTALL_LANG:-} == "zh" ]]; then
-  whimsy=(
-    "备好贴心的默认设置"
-    "省掉装机的折腾"
-    "挑选打磨过的软件包"
-    "调配协调的配色"
-    "准备悦目的像素"
-    "唤醒 Hyprland"
-    "接好顺手的界面"
-    "搭起漂亮的系统"
-    "写好趁手的命令"
-    "让机器焕然一新"
-    "擦亮每一个像素"
-    "调好终端的品味"
-    "织出流畅的工作流"
-  )
-  tips=(
-    "Super + Space 打开 Omarchy 菜单：应用、设置等"
-    "Super + K 查看全部快捷键"
-    "Super 是键盘上的 Windows 或 Command 键"
-    "用 Xournal++ 给 PDF 签名"
-    "用 LocalSend 和手机、电脑互传文件"
-    "菜单 安装 > 网页应用 把任意网站变成应用"
-    "Super + Return 打开终端，Super + Shift + Return 打开浏览器"
-    "图片用 Pinta，视频用 Kdenlive，文档用 LibreOffice"
-    "Super + Ctrl + Print 用 OCR 抓取屏幕文字"
-    "Print 截屏，Alt + Print 录屏"
-    "Super + Ctrl + R 设置提醒"
-    "菜单 风格 > 主题 切换主题"
-    "双击菜单栏让它透明"
-    "菜单 安装 > Windows 运行完整的 Windows 虚拟机"
-    "Super + Ctrl + V 打开剪贴板管理器"
-    "Super + 1 到 0 切换工作区，加 Shift 带上窗口"
-    "Super + Print 拾取屏幕上任意位置的颜色"
-    "用菜单里的 更新 让系统保持最新"
-  )
-fi
-
 cleanup() {
   printf '%s%s' "$RESET" "$SHOW_CURSOR" >"$TTY_PATH" 2>/dev/null || true
 }
@@ -361,8 +286,8 @@ left_padding() {
 
 visible_len() {
   local text="$1"
-  # wc -L counts display columns, so double-width CJK centers too.
-  printf '%b' "$text" | sed -E $'s/\x1b\\[[0-9;?]*[A-Za-z]//g' | wc -L
+  text="$(printf '%b' "$text" | sed -E $'s/\x1b\\[[0-9;?]*[A-Za-z]//g')"
+  printf '%s' "${#text}"
 }
 
 blank_line() { printf '\r%s\n' "$CLEAR_LINE"; }
@@ -753,7 +678,7 @@ render_dynamic() {
   render_icon "$DISPLAY_PM"
 
   message="$(truncate_for_width "$(current_whimsy)" "$PROGRESS_TEXT_WIDTH")"
-  tip="$(truncate_for_width "$(omarchy_text "Tip: %s" "$(current_tip)")" "$PROGRESS_TEXT_WIDTH")"
+  tip="$(truncate_for_width "Tip: $(current_tip)" "$PROGRESS_TEXT_WIDTH")"
   printf '%s%d;1H' "$CSI" "$((TOP_ROW + ICON_HEIGHT + 1))"
   center "${GREEN}$((DISPLAY_PM / 10))%${RESET}" "$PROGRESS_TEXT_WIDTH"
   center "${GREEN}${message}${RESET}" "$PROGRESS_TEXT_WIDTH"
@@ -793,13 +718,9 @@ install_duration() {
 }
 
 render_finish() {
-  local duration effect_canvas_width title
+  local duration effect_canvas_width title="Installed Omarchy"
   duration="$(install_duration || true)"
-  if [[ -n $duration ]]; then
-    title=$(omarchy_text "Installed Omarchy in %s" "$duration")
-  else
-    title=$(omarchy_text "Installed Omarchy")
-  fi
+  [[ -n $duration ]] && title+=" in ${duration}"
   # ttfx centers its text two columns right of plain centering. A canvas two
   # columns narrower aligns the animation with the title and fallback logo.
   effect_canvas_width="$(term_cols)"
@@ -844,7 +765,7 @@ render_finish() {
 }
 
 reboot_prompt() {
-  local prompt_pad label
+  local prompt_pad
 
   # Nobody to confirm; the OMARCHY_UI_AUTO_REBOOT check at the call site still
   # applies, so setting both stops on the finish screen without a keyboard.
@@ -855,31 +776,24 @@ reboot_prompt() {
   # gum allows. FINISH_HEIGHT budgets for the same three rows.
   printf '%s%d;1H%s' "$CSI" "$((FINISH_TOP_ROW + LOGO_HEIGHT + 2))" "$CLEAR_LINE" >"$TTY_PATH"
 
-  # gum pads the button label by four columns on each side.
-  label=$(omarchy_text "Reboot Now")
-  prompt_pad=$(( ( $(term_cols) - $(visible_len "$label") - 8 ) / 2 ))
+  prompt_pad=$(( ( $(term_cols) - 18 ) / 2 ))
   (( prompt_pad < 0 )) && prompt_pad=0
   gum confirm \
     --padding "0 0 0 $prompt_pad" \
     --show-help=false \
     --default \
-    --affirmative "$label" \
+    --affirmative "Reboot Now" \
     --negative "" \
     "" <"$TTY_PATH" >"$TTY_PATH" 2>&1
 }
 
-# Columns, not characters: each CJK character takes two.
 truncate_for_width() {
   local text="$1" width="$2"
-  if (( $(printf '%s' "$text" | wc -L) <= width )); then
+  if (( ${#text} > width )); then
+    printf '%s…' "${text:0:$((width - 1))}"
+  else
     printf '%s' "$text"
-    return
   fi
-  text=${text:0:$((width - 1))}
-  while (( $(printf '%s' "$text" | wc -L) > width - 1 )); do
-    text=${text%?}
-  done
-  printf '%s…' "$text"
 }
 
 render_failure_log_tail() {
@@ -905,8 +819,8 @@ render_failure_log_tail() {
   fi
   [[ -f $tail_log ]] || return 0
 
-  label=$(omarchy_text "Last log lines:")
-  [[ $tail_log == /mnt/* ]] && label=$(omarchy_text "Last target log lines:")
+  label="Last log lines:"
+  [[ $tail_log == /mnt/* ]] && label="Last target log lines:"
   line_at "$CONTENT_WIDTH" 2 "${DIM}${label}${RESET}"
   printf '\n'
   tail -n "$lines" "$tail_log" 2>/dev/null | while IFS= read -r line; do
@@ -929,7 +843,7 @@ find_log_uploader() {
 }
 
 prompt_enter() {
-  printf '\n%s' "$(omarchy_text "Press Enter to continue…")" >"$TTY_PATH"
+  printf '\nPress Enter to continue…' >"$TTY_PATH"
   IFS= read -r _ <"$TTY_PATH" || true
 }
 
@@ -940,9 +854,9 @@ upload_failure_log() {
     "$uploader" install >"$TTY_PATH" 2>&1 || true
   else
     {
-      printf '%s\n' "$(omarchy_text "No log uploader is available in this environment.")"
-      printf '%s\n' "$(omarchy_text "Install log: %s" "$LOG_FILE")"
-      [[ -f /mnt/var/log/omarchy-install.log ]] && printf '%s\n' "$(omarchy_text "Target log: %s" /mnt/var/log/omarchy-install.log)"
+      echo "No log uploader is available in this environment."
+      echo "Install log: $LOG_FILE"
+      [[ -f /mnt/var/log/omarchy-install.log ]] && echo "Target log: /mnt/var/log/omarchy-install.log"
     } >"$TTY_PATH"
   fi
   prompt_enter
@@ -993,8 +907,6 @@ render_media_diagnosis() {
       blank_line
       continue
     fi
-    # The support log keeps English; the screen shows the translation, and package names pass through.
-    [[ ${OMARCHY_INSTALL_LANG:-} == "zh" ]] && line=${OMARCHY_ZH[$line]:-$line}
     if (( first )); then
       center "${RED}$(truncate_for_width "$line" "$CONTENT_WIDTH")${RESET}" "$CONTENT_WIDTH"
       first=0
@@ -1010,8 +922,8 @@ render_failure() {
   blank_line
   render_logo
   blank_line
-  center "${RED}$(omarchy_text "Omarchy installation stopped")${RESET}" "$CONTENT_WIDTH"
-  center "$(omarchy_text "Installer exited with status %s" "$status")" "$CONTENT_WIDTH"
+  center "${RED}Omarchy installation stopped${RESET}" "$CONTENT_WIDTH"
+  center "Installer exited with status $status" "$CONTENT_WIDTH"
 
   render_media_diagnosis "$media_diagnosis"
 
@@ -1026,12 +938,12 @@ render_failure() {
   blank_line
   render_failure_log_tail "$(media_diagnosis_rows "$media_diagnosis")"
   blank_line
-  center "${DIM}$(omarchy_text "Get help at https://omarchy.org/discord")${RESET}" "$CONTENT_WIDTH"
+  center "${DIM}Get help at https://omarchy.org/discord${RESET}" "$CONTENT_WIDTH"
   blank_line
 }
 
 failure_menu() {
-  local choice uploader actions shown i
+  local choice uploader
 
   [[ ${OMARCHY_UI_FAILURE_ACTION:-} == "exit" ]] && return 0
   # The failure screen and log tail have already rendered; exit with the
@@ -1041,20 +953,26 @@ failure_menu() {
   while true; do
     uploader=""
     uploader=$(find_log_uploader || true)
-    actions=("View full log" "Drop to shell" "Reboot" "Power off")
-    [[ -n $uploader ]] && actions=("Upload log for support" "${actions[@]}")
-    shown=()
-    for i in "${!actions[@]}"; do
-      shown+=("$(omarchy_text "${actions[i]}")")
-    done
-    choice=$(gum choose \
-      --height "$((${#actions[@]} + 1))" \
-      --header "$(omarchy_text "What would you like to do?")" \
-      "${shown[@]}" \
-      <"$TTY_PATH" 2>"$TTY_PATH") || choice=""
-    for i in "${!shown[@]}"; do
-      [[ ${shown[i]} == "$choice" ]] && choice=${actions[i]}
-    done
+    if [[ -n $uploader ]]; then
+      choice=$(gum choose \
+        --height 6 \
+        --header "What would you like to do?" \
+        "Upload log for support" \
+        "View full log" \
+        "Drop to shell" \
+        "Reboot" \
+        "Power off" \
+        <"$TTY_PATH" 2>"$TTY_PATH") || choice="Drop to shell"
+    else
+      choice=$(gum choose \
+        --height 5 \
+        --header "What would you like to do?" \
+        "View full log" \
+        "Drop to shell" \
+        "Reboot" \
+        "Power off" \
+        <"$TTY_PATH" 2>"$TTY_PATH") || choice="Drop to shell"
+    fi
 
     case "$choice" in
       "Upload log for support")

configs/airootfs/usr/share/omarchy-iso/foot.ini

@@ -1,29 +0,0 @@
-# The Chinese installer's console: the VT's Tokyo Night palette, with Noto Sans Mono CJK from the offline mirror.
-[main]
-font=Noto Sans Mono CJK SC:size=13
-# Noto's tall default rows leave the summary too few lines for the logo.
-line-height=22px
-
-[colors-dark]
-background=1a1b26
-foreground=a9b1d6
-regular0=1a1b26
-regular1=f7768e
-regular2=9ece6a
-regular3=e0af68
-regular4=7aa2f7
-regular5=bb9af7
-regular6=7dcfff
-regular7=a9b1d6
-bright0=414868
-bright1=f7768e
-bright2=9ece6a
-bright3=e0af68
-bright4=7aa2f7
-bright5=bb9af7
-bright6=7dcfff
-bright7=c0caf5
-
-# cage draws no title bar, and a reserved one leaves a black strip.
-[csd]
-preferred=none

configs/airootfs/usr/share/omarchy-iso/orchestrator/archinstall_adapter.py

@@ -13,7 +13,7 @@ The canonical call sequence (mirrored from archinstall.scripts.guided.py) is:
         # configs do their own mounting before the Installer context opens.
         if disk_config.config_type != DiskLayoutType.Pre_mount:
             inst.mount_ordered_layout()
-        sanity_check(inst)
+        inst.sanity_check(offline=, skip_ntp=, skip_wkd=)
         inst.generate_key_files()                     # encrypted only
         inst.set_mirrors(handler, mirror_config, on_target=False)
         inst.minimal_installation(...)                # base + linux pacstrap
@@ -214,14 +214,6 @@ def _method_accepts(method, name: str) -> bool:
     return name in (*positional, *kwonly)
 
 
-def sanity_check(installer) -> None:
-    """Archinstall 4.5 removed offline; retain it for older releases."""
-    options = {"skip_ntp": True, "skip_wkd": True}
-    if _method_accepts(installer.sanity_check, "offline"):
-        options["offline"] = True
-    installer.sanity_check(**options)
-
-
 def _method_accepts_users(method) -> bool:
     return _method_accepts(method, "users")
 

configs/airootfs/usr/share/omarchy-iso/orchestrator/context.py

@@ -11,9 +11,6 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
 
-from .keyboard import validate_input_selection
-from .region import GLOBAL, resolve_region
-
 
 @dataclass
 class InstallContext:
@@ -30,7 +27,6 @@ class InstallContext:
     arch_config_path: Path
     omarchy_install: dict[str, Any]
     defer_provisioning: bool = False
-    region: str = GLOBAL
 
     target: Path = Path("/mnt")
     omarchy_path: Path = Path("/usr/share/omarchy")
@@ -61,13 +57,6 @@ class InstallContext:
             kernel = (omarchy_install.get("storage") or {}).get("kernel") or _default_kernel()
             user_configuration["kernels"] = [kernel]
 
-        validate_input_selection(omarchy_install.get("input_method"), omarchy_install.get("input_xkb_layout", ""))
-
-        # Resolved before any disk is touched, so an autoinstall naming a
-        # region this ISO lacks fails without wiping anything.
-        region = resolve_region(omarchy_install, user_configuration.get("timezone"))
-        omarchy_install["region"] = region
-
         # Deferred provisioning: the whole system installs but user creation is deferred to
         # first boot. Selected by the configurator (omarchy_install.defer_provisioning) or by
         # an `defer-provisioning` marker file on an autoinstall drive, which also replaces the
@@ -132,7 +121,6 @@ class InstallContext:
             arch_config_path=arch_config_path,
             omarchy_install=omarchy_install,
             defer_provisioning=defer_provisioning,
-            region=region,
             state_dir=state_dir,
         )
         disk_config = user_configuration.get("disk_config", {})

configs/airootfs/usr/share/omarchy-iso/orchestrator/keyboard.py

@@ -16,31 +16,21 @@ from pathlib import Path
 from .command import capture
 
 
-def configure_keyboard(target: Path, language: str, input_method: str | None = None, xkb_layout: str = "") -> bool:
+def configure_keyboard(target: Path, language: str) -> bool:
     """Write the console keymap into a mounted target without booting it.
 
     Returns False for layouts localectl doesn't know, matching archinstall:
     warn and keep the default. Every layout the configurator offers is known;
     the guard is for the kb_layout an autoinstall drive can name freely.
     """
-    validate_input_selection(input_method, xkb_layout)
     if not language.strip():
-        if input_method is None:
-            return True
-        language = "us"
-
-    # Input engines are separate from real console keymaps. The shared picker
-    # uses US for Chinese/Korean and carries its preference in omarchy_install.
-    if input_method is None:
-        input_method = "mozc" if language == "jp106" else "none"
+        return True
 
     result = capture(["localectl", "--no-pager", "list-keymaps"])
     if result.returncode != 0:
         detail = result.stderr.strip() or "localectl returned an error"
         raise RuntimeError(f"Unable to list keyboard layouts: {detail}")
     if language.lower() not in {layout.lower() for layout in result.stdout.splitlines()}:
-        if input_method != "none":
-            raise ValueError(f"Unknown keyboard language: {language}")
         return False
 
     # systemd-firstboot --force rewrites vconsole.conf wholesale, dropping the
@@ -61,15 +51,4 @@ def configure_keyboard(target: Path, language: str, input_method: str | None = N
     if font:
         vconsole_path.write_text(vconsole_path.read_text() + font + "\n")
 
-    preference = target / "etc/omarchy/input-method"
-    preference.parent.mkdir(parents=True, exist_ok=True)
-    preference.write_text(f"INPUT_METHOD={input_method}\nXKB_LAYOUT={xkb_layout}\n")
-
     return True
-
-
-def validate_input_selection(input_method: str | None, xkb_layout: str) -> None:
-    if input_method is not None and input_method not in {"none", "mozc", "hangul", "pinyin", "chewing"}:
-        raise ValueError(f"Unknown input method: {input_method}")
-    if xkb_layout not in {"", "kr"}:
-        raise ValueError(f"Unknown input keyboard layout: {xkb_layout}")

configs/airootfs/usr/share/omarchy-iso/orchestrator/phases_impl.py

@@ -36,10 +36,39 @@ from . import archinstall_adapter as arch
 from .command import capture, capture_identifier, require_text
 from .context import InstallContext
 from .keyboard import configure_keyboard
-from .region import GLOBAL, region_keyrings, region_packages
 from .ui import error, info
 
 
+ISO_REGION_FILE = Path("/root/omarchy_region")
+ISO_REGION_PAYLOAD = Path("/usr/share/omarchy-iso/region")
+
+
+def _iso_region() -> str:
+    region = ISO_REGION_FILE.read_text().strip() if ISO_REGION_FILE.exists() else "global"
+    if region not in {"global", "cn"}:
+        raise RuntimeError(f"Unsupported ISO region: {region}")
+    return region
+
+
+def _stage_region_defaults(target: Path) -> None:
+    """Seed the target before useradd, including deferred first-boot users.
+
+    Region is a bootstrap default, not a locale or a user-level policy.
+    Existing home directories are never rewritten by this step.
+    """
+    region = _iso_region()
+    if region != "global":
+        if not ISO_REGION_PAYLOAD.is_dir():
+            raise RuntimeError(f"Missing ISO payload for region: {region}")
+        skel = ISO_REGION_PAYLOAD / "skel"
+        if skel.is_dir():
+            shutil.copytree(skel, target / "etc/skel", dirs_exist_ok=True)
+    marker = target / "etc/omarchy/region"
+    marker.parent.mkdir(parents=True, exist_ok=True)
+    marker.write_text(region + "\n")
+    marker.chmod(0o644)
+
+
 # Package targets are written by builder/build-iso.sh. Stable ISOs use the
 # stable package names, while dev/local-source ISOs install the dev package
 # names explicitly instead of relying on provides=omarchy resolution.
@@ -236,7 +265,11 @@ def arch_install_system(ctx: InstallContext) -> None:
         if not pre_mounted:
             installer.mount_ordered_layout()
 
-        arch.sanity_check(installer)
+        installer.sanity_check(
+            offline=True,
+            skip_ntp=True,
+            skip_wkd=True,
+        )
 
         if not pre_mounted and arch.is_encrypted(config):
             installer.generate_key_files()
@@ -271,11 +304,7 @@ def arch_install_system(ctx: InstallContext) -> None:
             # use the target kernel instead of the live ISO's kernel.
             installer.add_additional_packages([f"{kernel}-headers" for kernel in config.kernels])
 
-            if not configure_keyboard(
-                installer.target, kb_layout,
-                ctx.omarchy_install.get("input_method"),
-                ctx.omarchy_install.get("input_xkb_layout", ""),
-            ):
+            if not configure_keyboard(installer.target, kb_layout):
                 error(f"Invalid keyboard language specified: {kb_layout}")
 
             if config.mirror_config:
@@ -288,6 +317,7 @@ def arch_install_system(ctx: InstallContext) -> None:
             _install_early_packages(installer)
             _configure_limine_boot(ctx, installer, config)
 
+            _stage_region_defaults(ctx.target)
             info("› creating user (with /etc/skel populated)")
             if config.auth_config and config.auth_config.users:
                 installer.create_users(config.auth_config.users)
@@ -299,11 +329,6 @@ def arch_install_system(ctx: InstallContext) -> None:
             info("› installing Omarchy runtime + omarchy-base.packages")
             installer.add_additional_packages(_runtime_package_list(ctx))
 
-            if region_pkgs := region_packages(ctx.region):
-                info(f"› installing {ctx.region} region packages: {', '.join(region_pkgs)}")
-                installer.add_additional_packages(region_pkgs)
-            _write_region_marker(ctx)
-
             # Tailscale is bundled in the offline mirror but only installed
             # when an autoinstall drive staged an auth key; must happen here,
             # while the mirror is still bind-mounted, not in the phase that
@@ -734,17 +759,6 @@ def _unmask_mkinitcpio_pacman_hooks(
             info(f"warning: failed to restore pacman hook mask for {name}: {exc}")
 
 
-def _write_region_marker(ctx: InstallContext) -> None:
-    """Tell the runtime's pacman finalizer which profile to apply. Global
-    installs write nothing, so they stay identical to a region-less install."""
-    if ctx.region == GLOBAL:
-        return
-    marker = ctx.target / "etc/omarchy/region"
-    marker.parent.mkdir(parents=True, exist_ok=True)
-    marker.write_text(ctx.region + "\n")
-    marker.chmod(0o644)
-
-
 def _runtime_package_list(ctx: InstallContext) -> list[str]:
     """Selected Omarchy runtime package + every package in the ISO-bundled
     base package list that isn't already installed early."""
@@ -1152,13 +1166,12 @@ def _run_target_setup_command(ctx: InstallContext, cmd: list[str], *, user: str
 
 
 def run_system_finalizer(ctx: InstallContext) -> None:
-    # The region's keyring packages are installed by now, but the build
-    # container's GPG state is not inherited. Initialize the target's trust
-    # database with only this region's keys before the finalizer enables its
-    # online repositories; global installs never trust them.
-    if keyrings := region_keyrings(ctx.region):
+    # The runtime package transaction has installed the regional keyring from
+    # the ISO. Initialize the target's trust database before enabling the online
+    # community repository; the build container's GPG state is not inherited.
+    if _iso_region() == "cn":
         _run_target_setup_command(ctx, ["pacman-key", "--init"])
-        _run_target_setup_command(ctx, ["pacman-key", "--populate", "archlinux", *keyrings])
+        _run_target_setup_command(ctx, ["pacman-key", "--populate", "archlinux", "archlinuxcn"])
 
     if ctx.defer_provisioning:
         cmd = ["/usr/bin/omarchy-apply-system", "--defer-provisioning", "--first-install"]

configs/airootfs/usr/share/omarchy-iso/orchestrator/region.py

@@ -1,68 +0,0 @@
-"""Region selection: which of the runtime's region profiles a target gets.
-
-The builder copies every profile from the bundled runtime's default/regions/
-into REGIONS_DIR, and their packages into the offline mirror. Nobody picks a
-region by hand: the timezone the user already chose selects it, and an
-autoinstall config may name one explicitly in omarchy_install.region. Run as
-`python -m orchestrator.region <timezone>` to print the region the installer
-would use, which is how the configurator fills its summary.
-"""
-
-from __future__ import annotations
-
-import re
-import sys
-from pathlib import Path
-
-REGIONS_DIR = Path("/usr/share/omarchy-iso/regions")
-GLOBAL = "global"
-
-
-def _entries(path: Path) -> list[str]:
-    if not path.is_file():
-        return []
-    lines = (line.strip() for line in path.read_text().splitlines())
-    return [line for line in lines if line and not line.startswith("#")]
-
-
-def region_for_timezone(timezone: str | None, regions_dir: Path | None = None) -> str:
-    regions_dir = regions_dir or REGIONS_DIR
-    if timezone and regions_dir.is_dir():
-        for profile in sorted(regions_dir.iterdir()):
-            if timezone in _entries(profile / "timezones"):
-                return profile.name
-    return GLOBAL
-
-
-def resolve_region(omarchy_install: dict, timezone: str | None, regions_dir: Path | None = None) -> str:
-    regions_dir = regions_dir or REGIONS_DIR
-    region = omarchy_install.get("region")
-    if region is None or region == "":
-        return region_for_timezone(timezone, regions_dir)
-    # Profiles are named by ISO 3166-1 alpha-2 code; checking the shape first
-    # keeps a path like ".." from passing the directory test.
-    if not isinstance(region, str) or (
-        region != GLOBAL and not (re.fullmatch(r"[a-z]{2}", region) and (regions_dir / region).is_dir())
-    ):
-        raise RuntimeError(f"Unsupported region: {region!r}")
-    return region
-
-
-def region_packages(region: str, regions_dir: Path | None = None) -> list[str]:
-    if region == GLOBAL:
-        return []
-    return _entries((regions_dir or REGIONS_DIR) / region / "packages")
-
-
-def region_keyrings(region: str, regions_dir: Path | None = None) -> list[str]:
-    """Pacman keyrings the profile ships, named the Arch way: <name>-keyring
-    installs /usr/share/pacman/keyrings/<name>.gpg."""
-    return [
-        package.removesuffix("-keyring")
-        for package in region_packages(region, regions_dir)
-        if package.endswith("-keyring")
-    ]
-
-
-if __name__ == "__main__":
-    print(region_for_timezone(sys.argv[1] if len(sys.argv) > 1 else None))

configs/pacman-online-edge.conf

@@ -13,10 +13,6 @@ ParallelDownloads = 5
 SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
 
-[omarchy]
-SigLevel = Optional TrustAll
-Server = https://pkgs.omarchy.org/edge/$arch
-
 [core]
 Server = https://mirror.omarchy.org/$repo/os/$arch
 Include = /etc/pacman.d/mirrorlist
@@ -29,6 +25,10 @@ Include = /etc/pacman.d/mirrorlist
 Server = https://mirror.omarchy.org/$repo/os/$arch
 Include = /etc/pacman.d/mirrorlist
 
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/edge/$arch
+
 [arch-mact2]
 Server = https://mirror.funami.tech/arch-mact2/os/x86_64
 Server = https://github.com/NoaHimesaka1873/arch-mact2-mirror/releases/download/release

configs/pacman-online-rc.conf

@@ -13,10 +13,6 @@ ParallelDownloads = 5
 SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
 
-[omarchy]
-SigLevel = Optional TrustAll
-Server = https://pkgs.omarchy.org/rc/$arch
-
 [core]
 Server = https://rc-mirror.omarchy.org/$repo/os/$arch
 Include = /etc/pacman.d/mirrorlist
@@ -29,6 +25,10 @@ Include = /etc/pacman.d/mirrorlist
 Server = https://rc-mirror.omarchy.org/$repo/os/$arch
 Include = /etc/pacman.d/mirrorlist
 
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/rc/$arch
+
 [arch-mact2]
 Server = https://mirror.funami.tech/arch-mact2/os/x86_64
 Server = https://github.com/NoaHimesaka1873/arch-mact2-mirror/releases/download/release

configs/pacman-online-stable.conf

@@ -13,10 +13,6 @@ ParallelDownloads = 5
 SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
 
-[omarchy]
-SigLevel = Optional TrustAll
-Server = https://pkgs.omarchy.org/stable/$arch
-
 [core]
 Server = https://stable-mirror.omarchy.org/$repo/os/$arch
 Include = /etc/pacman.d/mirrorlist
@@ -29,6 +25,10 @@ Include = /etc/pacman.d/mirrorlist
 Server = https://stable-mirror.omarchy.org/$repo/os/$arch
 Include = /etc/pacman.d/mirrorlist
 
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/stable/$arch
+
 [arch-mact2]
 Server = https://mirror.funami.tech/arch-mact2/os/x86_64
 Server = https://github.com/NoaHimesaka1873/arch-mact2-mirror/releases/download/release

test/unit/install-media-diagnosis-test.sh

@@ -273,12 +273,6 @@ mkdir -p "$omarchy_share"
   printf 'logo bottom row%*s\n' 66 ''
 } >"$omarchy_share/logo.txt"
 
-# The ISO vendors the runtime's setup form; the dashboard only needs its text lookup.
-cat >"$work/setup-form.sh" <<'FORM'
-declare -gA OMARCHY_ZH=()
-omarchy_text() { local text=$1; shift; printf -- "$text" "$@"; }
-FORM
-
 run_dashboard() {
   local install_log="$1"
 
@@ -290,7 +284,7 @@ run_dashboard() {
              "error": "Pacstrap failed. See /var/log/archinstall.log"}]}
 STATE
   : >"$screen"
-  script -qefc "stty rows 40 cols 120; PATH='$stubs:$PATH' OMARCHY_PATH='$omarchy_share' SETUP_FORM='$work/setup-form.sh' OMARCHY_UI_INTERACTIVE=no OMARCHY_UI_FAILURE_ACTION=exit OMARCHY_FAILURE_TAIL_LOG='$install_log' '$DASHBOARD' '$install_log' '$state_file' -- bash -c 'exit 1'" \
+  script -qefc "stty rows 40 cols 120; PATH='$stubs:$PATH' OMARCHY_PATH='$omarchy_share' OMARCHY_UI_INTERACTIVE=no OMARCHY_UI_FAILURE_ACTION=exit OMARCHY_FAILURE_TAIL_LOG='$install_log' '$DASHBOARD' '$install_log' '$state_file' -- bash -c 'exit 1'" \
     "$screen" >/dev/null 2>&1
 }
 

test/unit/install-text-zh-test.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# Every installer text needs an OMARCHY_ZH entry, or a Chinese install shows it in English.
-
-set -euo pipefail
-
-ROOT=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)
-SETUP_FORM="${OMARCHY_SOURCE:-$ROOT/../omarchy}/install/provisioning/setup-form.sh"
-
-fail() {
-  printf 'not ok - %s\n' "$1"
-  [[ -z ${2:-} ]] || printf '%s\n' "$2" | sed 's/^/# /'
-  exit 1
-}
-
-if [[ ! -r $SETUP_FORM ]]; then
-  printf 'ok - # skip the setup form is not checked out next to this repo (set OMARCHY_SOURCE)\n'
-  exit 0
-fi
-
-source "$SETUP_FORM"
-for file in configs/airootfs/root/configurator configs/airootfs/usr/local/bin/omarchy-install-dashboard; do
-  eval "$(sed -n '/^OMARCHY_ZH+=(/,/^)/p' "$ROOT/$file")"
-done
-
-mapfile -t texts < <(
-  grep -ho 'omarchy_text "[^"$]*"' "$ROOT/configs/airootfs/root/configurator" "$ROOT/configs/airootfs/usr/local/bin/omarchy-install-dashboard" |
-    sed 's/^omarchy_text "//; s/"$//' | sort -u
-)
-((${#texts[@]} > 50)) || fail "the installer routes its text through omarchy_text" "found ${#texts[@]}"
-for text in "${texts[@]}"; do
-  [[ -n ${OMARCHY_ZH[$text]:-} ]] || fail "every installer text has a Chinese entry" "missing: $text"
-done
-printf 'ok - every installer and dashboard text has a Chinese entry\n'
-
-for action in "View full log" "Drop to shell" "Reboot" "Power off" "Upload log for support"; do
-  [[ -n ${OMARCHY_ZH[$action]:-} ]] || fail "labels passed through variables have Chinese entries" "missing: $action"
-done
-printf 'ok - labels passed through variables have Chinese entries\n'
-
-mapfile -t diagnosis < <(grep -x ' *echo "[^"$]*"' "$ROOT/configs/airootfs/usr/local/bin/omarchy-install-diagnose-media" | sed 's/^ *echo "//; s/"$//')
-((${#diagnosis[@]} >= 10)) || fail "the media diagnosis sentences are found" "found ${#diagnosis[@]}"
-for line in "${diagnosis[@]}"; do
-  [[ -n ${OMARCHY_ZH[$line]:-} ]] || fail "every media diagnosis sentence has a Chinese entry" "missing: $line"
-done
-printf 'ok - every media diagnosis sentence has a Chinese entry\n'
-
-[[ $(OMARCHY_INSTALL_LANG=zh omarchy_text "Confirm overwriting %s" /dev/vda) == "确认覆盖 /dev/vda" ]] ||
-  fail "Chinese text keeps its printf arguments"
-[[ $(omarchy_text "Confirm overwriting %s" /dev/vda) == "Confirm overwriting /dev/vda" ]] ||
-  fail "English stays the default"
-printf 'ok - omarchy_text formats Chinese and English alike\n'

test/unit/keyboard-selection-test.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-ROOT=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)
-work=$(mktemp -d)
-trap 'rm -rf "$work"' EXIT
-mkdir -p "$work/install/provisioning"
-cat > "$work/install/provisioning/setup-form.sh" <<'FORM'
-OMARCHY_KEYBOARD_LAYOUTS=$'Chinese (Simplified, Pinyin)|us|pinyin
-English (US)|us
-Japanese|jp106|mozc'
-FORM
-export OMARCHY_PATH="$work"
-eval "$(sed -n '/^select_keyboard() {$/,/^}$/p' "$ROOT/bin/omarchy-iso-test")"
-press() { pressed+=("$1"); }
-sleep() { :; }
-
-pressed=()
-select_keyboard "Japanese"
-[[ ${pressed[*]} == "down" ]]
-pressed=()
-select_keyboard "Chinese (Simplified, Pinyin)"
-[[ ${pressed[*]} == "up" ]]
-pressed=()
-select_keyboard "English (US)"
-(( ${#pressed[@]} == 0 ))
-if (set -e; select_keyboard "Missing") 2>"$work/error"; then
-  echo "Unknown keyboard unexpectedly succeeded" >&2
-  exit 1
-fi
-grep -q 'Keyboard choice is absent' "$work/error"
-echo "ok - VM keyboard choices are relative to the default and reject absent rows"

test/unit/test_archinstall_sanity.py

@@ -1,29 +0,0 @@
-"""Exercise the compatibility boundary without importing host archinstall."""
-import ast
-from pathlib import Path
-import types
-import unittest
-
-ROOT = Path(__file__).resolve().parents[2]
-source = ROOT / "configs/airootfs/usr/share/omarchy-iso/orchestrator/archinstall_adapter.py"
-tree = ast.parse(source.read_text())
-namespace = {}
-functions = [node for node in tree.body if isinstance(node, ast.FunctionDef) and node.name in {"_method_accepts", "sanity_check"}]
-exec(compile(ast.Module(body=functions, type_ignores=[]), str(source), "exec"), namespace)
-
-
-class SanityCheckTest(unittest.TestCase):
-    def test_legacy_archinstall_stays_offline(self):
-        calls = []
-        def check(offline=False, skip_ntp=False, skip_wkd=False):
-            calls.append((offline, skip_ntp, skip_wkd))
-        namespace["sanity_check"](types.SimpleNamespace(sanity_check=check))
-        self.assertEqual(calls, [(True, True, True)])
-
-    def test_archinstall_45_does_not_receive_removed_argument(self):
-        calls = []
-        class Installer:
-            def sanity_check(self, skip_ntp=False, skip_wkd=False):
-                calls.append((skip_ntp, skip_wkd))
-        namespace["sanity_check"](Installer())
-        self.assertEqual(calls, [(True, True)])

test/unit/test_kernel_selection.py

@@ -93,6 +93,7 @@ class KernelSelectionTest(unittest.TestCase):
                     events = []
                     installer = mock.MagicMock()
                     installer.minimal_installation.side_effect = lambda **kwargs: events.append("base")
+                    installer.create_users.side_effect = lambda users: events.append("user")
 
                     def install_packages(packages):
                         events.append(packages)
@@ -102,13 +103,12 @@ class KernelSelectionTest(unittest.TestCase):
                     installer.add_additional_packages.side_effect = install_packages
                     config = types.SimpleNamespace(
                         kernels=kernels, locale_config=None, mirror_config=None,
-                        swap=None, auth_config=None, app_config=None, timezone=None,
+                        swap=None, auth_config=types.SimpleNamespace(users=["alice"]), app_config=None, timezone=None,
                         ntp=False, hostname="test", pacman_config="/etc/pacman.conf",
                     )
                     ctx = types.SimpleNamespace(
                         state={"arch_config_handler": types.SimpleNamespace(config=config), "mirror_handler": None},
-                        target=Path("/unused"), tailscale_authkey_path=None, omarchy_install={},
-                        region="global",
+                        target=Path("/unused"), tailscale_authkey_path=None,
                     )
                     for name in ("_mount_offline_package_cache", "_mask_mkinitcpio_pacman_hooks",
                                  "_configure_limine_boot", "_write_pre_mounted_fstab"):
@@ -117,10 +117,10 @@ class KernelSelectionTest(unittest.TestCase):
                     unmount = stack.enter_context(mock.patch.object(phases_impl, "_unmount_offline_package_cache"))
                     stack.enter_context(mock.patch.object(phases_impl, "configure_keyboard", return_value=True))
                     stack.enter_context(mock.patch.object(phases_impl, "_install_early_packages", side_effect=lambda inst: events.append("early")))
+                    stack.enter_context(mock.patch.object(phases_impl, "_stage_region_defaults", side_effect=lambda target: events.append("region")))
                     stack.enter_context(mock.patch.object(phases_impl, "_runtime_package_list", return_value=["omarchy"]))
                     stack.enter_context(mock.patch.object(phases_impl.arch, "is_pre_mount", return_value=True, create=True))
                     stack.enter_context(mock.patch.object(phases_impl.arch, "root_user", return_value=None, create=True))
-                    stack.enter_context(mock.patch.object(phases_impl.arch, "sanity_check", create=True))
                     opened = stack.enter_context(mock.patch.object(phases_impl.arch, "open_installer", create=True))
                     opened.return_value.__enter__.return_value = installer
                     if fail_headers:
@@ -130,7 +130,7 @@ class KernelSelectionTest(unittest.TestCase):
                         phases_impl.arch_install_system(ctx)
                     expected = ["base", [f"{kernel}-headers" for kernel in kernels]]
                     if not fail_headers:
-                        expected += ["early", ["omarchy"]]
+                        expected += ["early", "region", "user", ["omarchy"]]
                     self.assertEqual(events, expected)
                     unmask.assert_called_once_with(ctx)
                     unmount.assert_called_once_with(ctx)

test/unit/test_keyboard.py

@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
 import re
-import os
 import sys
 import tempfile
 import unittest
@@ -18,7 +17,6 @@ from orchestrator import keyboard as KEYBOARD  # noqa: E402
 # wherever this checkout can see a runtime, and skip the coverage test rather
 # than fail when none is around (a bare CI checkout of just this repo).
 SETUP_FORM_CANDIDATES = (
-    Path(os.environ.get("OMARCHY_PATH", "/nonexistent")) / "install/provisioning/setup-form.sh",
     Path("/omarchy-source/install/provisioning/setup-form.sh"),
     ROOT.parent / "omarchy/install/provisioning/setup-form.sh",
     Path("/usr/share/omarchy/install/provisioning/setup-form.sh"),
@@ -33,7 +31,7 @@ def supported_keymaps():
             r"OMARCHY_KEYBOARD_LAYOUTS=\$'(.*?)'\n", candidate.read_text(), re.DOTALL
         )
         assert block, f"no layout list in {candidate}"
-        return [line.split("|")[1] for line in block.group(1).splitlines()]
+        return [line.split("|", 1)[1] for line in block.group(1).splitlines()]
     return None
 
 
@@ -81,36 +79,6 @@ class KeyboardConfigurationTest(unittest.TestCase):
                     "KEYMAP=us\nFONT=default8x16\n",
                 )
 
-    def test_input_choice_survives_while_console_keymap_stays_real(self):
-        for method, keymap, layout in (("mozc", "jp106", ""), ("mozc", "us", ""), ("hangul", "us", "kr"), ("pinyin", "us", ""), ("chewing", "us", "")):
-            with self.subTest(method=method), tempfile.TemporaryDirectory() as directory:
-                target = self.target(directory)
-                self.assertTrue(KEYBOARD.configure_keyboard(target, keymap, method, layout))
-                self.assertIn(f"KEYMAP={keymap}", (target / "etc/vconsole.conf").read_text())
-                if keymap == "jp106":
-                    self.assertIn("XKBLAYOUT=jp", (target / "etc/vconsole.conf").read_text())
-                self.assertEqual((target / "etc/omarchy/input-method").read_text(), f"INPUT_METHOD={method}\nXKB_LAYOUT={layout}\n")
-
-    def test_input_choice_with_no_console_map_defaults_to_us(self):
-        with tempfile.TemporaryDirectory() as directory:
-            target = self.target(directory)
-            self.assertTrue(KEYBOARD.configure_keyboard(target, "", "pinyin"))
-            self.assertIn("INPUT_METHOD=pinyin", (target / "etc/omarchy/input-method").read_text())
-
-    def test_unknown_keyboard_does_not_silently_drop_an_input_choice(self):
-        with tempfile.TemporaryDirectory() as directory:
-            target = self.target(directory)
-            with self.assertRaises(ValueError):
-                KEYBOARD.configure_keyboard(target, "unknown", "pinyin")
-
-    def test_invalid_input_preferences_are_rejected_without_writes(self):
-        for method, layout in (("unknown", ""), ("hangul", "kr\nKEYMAP=ru")):
-            with tempfile.TemporaryDirectory() as directory:
-                target = self.target(directory)
-                with self.assertRaises(ValueError):
-                    KEYBOARD.configure_keyboard(target, "us", method, layout)
-                self.assertFalse((target / "etc/omarchy/input-method").exists())
-
 
 if __name__ == "__main__":
     unittest.main()

test/unit/test_region.py

@@ -1,235 +1,286 @@
-"""The target's region comes from its timezone, using the runtime's profiles."""
+"""Region bootstrap contracts without Docker, pacman, or a running guest."""
 
-import json
 import os
+import re
+import shutil
 import subprocess
 import sys
 import tempfile
 import types
 import unittest
-from contextlib import ExitStack
 from pathlib import Path
 from unittest import mock
 
 ROOT = Path(__file__).resolve().parents[2]
 sys.path.insert(0, str(ROOT / "configs/airootfs/usr/share/omarchy-iso"))
-sys.modules.setdefault(
-    "orchestrator.archinstall_adapter",
-    types.ModuleType("orchestrator.archinstall_adapter"),
-)
-from orchestrator import context, phases_impl, region  # noqa: E402
+sys.modules.setdefault("orchestrator.archinstall_adapter", types.ModuleType("orchestrator.archinstall_adapter"))
+from orchestrator import phases_impl
 
 
-def write_profiles(root: Path) -> Path:
-    regions = root / "regions"
-    cn = regions / "cn"
-    (cn / "pacman").mkdir(parents=True)
-    (cn / "timezones").write_text("# China\nAsia/Shanghai\n\n  Asia/Urumqi  \n")
-    (cn / "packages").write_text("# keyring first\narchlinuxcn-keyring\nextra-tool\n")
-    (cn / "pacman/pacman.conf.append").write_text("[archlinuxcn]\nServer = https://example.invalid/$arch\n")
-    for channel in ("stable", "rc", "edge"):
-        (cn / f"pacman/mirrorlist-{channel}.prepend").write_text(f"Server = https://{channel}.example.invalid/$repo/os/$arch\n")
-    return regions
-
-
-class RegionSelectionTest(unittest.TestCase):
+class RegionTargetTest(unittest.TestCase):
     def setUp(self):
         tmp = tempfile.TemporaryDirectory()
         self.addCleanup(tmp.cleanup)
         self.root = Path(tmp.name)
-        self.regions = write_profiles(self.root)
-        patcher = mock.patch.object(region, "REGIONS_DIR", self.regions)
-        patcher.start()
-        self.addCleanup(patcher.stop)
+        self.target = self.root / "target"
+        self.marker = self.root / "omarchy_region"
+        self.payload = self.root / "payload"
+        for name, value in (("ISO_REGION_FILE", self.marker), ("ISO_REGION_PAYLOAD", self.payload)):
+            patch = mock.patch.object(phases_impl, name, value)
+            patch.start()
+            self.addCleanup(patch.stop)
 
-    def test_timezone_selects_region(self):
-        for timezone, expected in [
-            ("Asia/Shanghai", "cn"),
-            ("Asia/Urumqi", "cn"),
-            ("Asia/Hong_Kong", "global"),
-            ("America/New_York", "global"),
-            ("UTC", "global"),
-            ("# China", "global"),
-            ("", "global"),
-            (None, "global"),
-        ]:
-            with self.subTest(timezone=timezone):
-                self.assertEqual(region.region_for_timezone(timezone), expected)
+    def test_global_does_not_need_a_profile_or_change_user_defaults(self):
+        phases_impl._stage_region_defaults(self.target)
+        self.assertEqual((self.target / "etc/omarchy/region").read_text(), "global\n")
+        self.assertFalse((self.target / "etc/skel").exists())
 
-    def test_iso_without_profiles_is_global(self):
-        self.assertEqual(region.region_for_timezone("Asia/Shanghai", self.root / "missing"), "global")
-        self.assertEqual(region.resolve_region({}, "Asia/Shanghai", self.root / "missing"), "global")
+    def test_cn_seeds_skel_without_touching_existing_users_or_locale(self):
+        self.marker.write_text("cn\n")
+        profile = self.payload / "skel/.config/example/defaults"
+        profile.parent.mkdir(parents=True)
+        profile.write_text("regional defaults\n")
+        existing = self.target / "home/alice/.config/example/defaults"
+        existing.parent.mkdir(parents=True)
+        existing.write_text("personal settings\n")
+        skel = self.target / "etc/skel"
+        skel.mkdir(parents=True)
+        (skel / ".bashrc").write_text("original\n")
+        (self.target / "etc/locale.conf").write_text("LANG=en_US.UTF-8\n")
 
-    def test_autoinstall_region_overrides_timezone(self):
-        self.assertEqual(region.resolve_region({"region": "cn"}, "UTC"), "cn")
-        self.assertEqual(region.resolve_region({"region": "global"}, "Asia/Shanghai"), "global")
-        self.assertEqual(region.resolve_region({}, "Asia/Shanghai"), "cn")
-        for bad in ("us", "CN", "..", "cn/../cn", True, 1, ["cn"]):
-            with self.subTest(region=bad), self.assertRaises(RuntimeError):
-                region.resolve_region({"region": bad}, "UTC")
+        phases_impl._stage_region_defaults(self.target)
+        self.assertEqual((skel / ".config/example/defaults").read_text(), "regional defaults\n")
+        self.assertEqual((skel / ".bashrc").read_text(), "original\n")
+        self.assertEqual(existing.read_text(), "personal settings\n")
+        self.assertEqual((self.target / "etc/locale.conf").read_text(), "LANG=en_US.UTF-8\n")
+        self.assertEqual((self.target / "etc/omarchy/region").read_text(), "cn\n")
 
-    def test_profile_packages_and_keyrings(self):
-        self.assertEqual(region.region_packages("cn"), ["archlinuxcn-keyring", "extra-tool"])
-        self.assertEqual(region.region_keyrings("cn"), ["archlinuxcn"])
-        self.assertEqual(region.region_packages("global"), [])
-        self.assertEqual(region.region_keyrings("global"), [])
+    def test_bad_region_and_missing_payload_fail_before_target_changes(self):
+        for region in ("CN", "chn", "zz", "../cn", "", "cn"):
+            with self.subTest(region=region):
+                self.marker.write_text(region)
+                with self.assertRaises(RuntimeError):
+                    phases_impl._stage_region_defaults(self.target)
+                self.assertFalse(self.target.exists())
 
-    def from_env(self, config: dict) -> context.InstallContext:
-        config_path = self.root / "config.json"
-        creds_path = self.root / "creds.json"
-        config_path.write_text(json.dumps(config))
-        creds_path.write_text(json.dumps({"users": [{"username": "test"}]}))
-        with mock.patch.dict(os.environ, {
-            "OMARCHY_INSTALL_CONFIG": str(config_path),
-            "OMARCHY_INSTALL_CREDS": str(creds_path),
-            "OMARCHY_INSTALL_STATE_DIR": str(self.root / "state"),
-        }, clear=True), mock.patch.object(context, "_default_kernel", return_value="linux-omarchy"):
-            return context.InstallContext.from_env()
-
-    def test_context_resolves_region_before_install(self):
-        self.assertEqual(self.from_env({"timezone": "Asia/Shanghai"}).region, "cn")
-        self.assertEqual(self.from_env({"timezone": "Europe/Berlin"}).region, "global")
-        # Deferred installs carry UTC until first boot, so they are global
-        # unless the autoinstall config names a region.
-        self.assertEqual(self.from_env({"timezone": "UTC"}).region, "global")
-        self.assertEqual(self.from_env({"timezone": "UTC", "omarchy_install": {"region": "cn"}}).region, "cn")
-        with self.assertRaises(RuntimeError):
-            self.from_env({"omarchy_install": {"region": "zz"}})
-
-    def test_marker_is_written_only_for_regional_targets(self):
-        target = self.root / "target"
-        phases_impl._write_region_marker(types.SimpleNamespace(target=target, region="global"))
-        self.assertFalse((target / "etc/omarchy/region").exists())
-
-        phases_impl._write_region_marker(types.SimpleNamespace(target=target, region="cn"))
-        marker = target / "etc/omarchy/region"
-        self.assertEqual(marker.read_text(), "cn\n")
-        self.assertEqual(marker.stat().st_mode & 0o777, 0o644)
-
-    def test_region_packages_install_while_the_offline_mirror_is_mounted(self):
-        for selected, expected_packages in [("global", []), ("cn", [["archlinuxcn-keyring", "extra-tool"]])]:
-            with self.subTest(region=selected), ExitStack() as stack:
-                events = []
-                installer = mock.MagicMock()
-                installer.add_additional_packages.side_effect = lambda packages: events.append(packages)
-                config = types.SimpleNamespace(
-                    kernels=["linux-omarchy"], locale_config=None, mirror_config=None,
-                    swap=None, auth_config=None, app_config=None, timezone=None,
-                    ntp=False, hostname="test", pacman_config="/etc/pacman.conf",
-                )
-                ctx = types.SimpleNamespace(
-                    state={"arch_config_handler": types.SimpleNamespace(config=config), "mirror_handler": None},
-                    target=self.root / "target", tailscale_authkey_path=None, omarchy_install={},
-                    region=selected,
-                )
-                for name in ("_mount_offline_package_cache", "_mask_mkinitcpio_pacman_hooks",
-                             "_unmask_mkinitcpio_pacman_hooks", "_configure_limine_boot",
-                             "_write_pre_mounted_fstab", "_install_early_packages"):
-                    stack.enter_context(mock.patch.object(phases_impl, name))
-                stack.enter_context(mock.patch.object(
-                    phases_impl, "_unmount_offline_package_cache", side_effect=lambda _: events.append("unmount")))
-                stack.enter_context(mock.patch.object(phases_impl, "configure_keyboard", return_value=True))
-                stack.enter_context(mock.patch.object(phases_impl, "_runtime_package_list", return_value=["omarchy"]))
-                for name, value in (("is_pre_mount", True), ("root_user", None)):
-                    stack.enter_context(mock.patch.object(phases_impl.arch, name, return_value=value, create=True))
-                stack.enter_context(mock.patch.object(phases_impl.arch, "sanity_check", create=True))
-                opened = stack.enter_context(mock.patch.object(phases_impl.arch, "open_installer", create=True))
-                opened.return_value.__enter__.return_value = installer
-
-                phases_impl.arch_install_system(ctx)
-
-                self.assertEqual(events, [["linux-omarchy-headers"], ["omarchy"], *expected_packages, "unmount"])
-                self.assertEqual((ctx.target / "etc/omarchy/region").exists(), selected != "global")
-
-    def test_finalizer_trusts_only_the_selected_region(self):
-        for selected, expected in [
-            ("global", []),
-            ("cn", [["pacman-key", "--init"], ["pacman-key", "--populate", "archlinux", "archlinuxcn"]]),
-        ]:
-            with self.subTest(region=selected), \
-                    mock.patch.object(phases_impl, "_run_target_setup_command") as run, \
-                    mock.patch.object(phases_impl, "_mask_mkinitcpio_pacman_hooks"), \
-                    mock.patch.object(phases_impl, "_unmask_mkinitcpio_pacman_hooks"):
-                ctx = types.SimpleNamespace(region=selected, defer_provisioning=True, target=Path("/unused"))
+    def test_cn_keyring_is_initialized_before_finalization_for_both_install_modes(self):
+        self.marker.write_text("cn\n")
+        for deferred in (False, True):
+            ctx = types.SimpleNamespace(target=self.target, username="alice", defer_provisioning=deferred)
+            with mock.patch.object(phases_impl, "_run_target_setup_command") as run, \
+                 mock.patch.object(phases_impl, "_mask_mkinitcpio_pacman_hooks"), \
+                 mock.patch.object(phases_impl, "_unmask_mkinitcpio_pacman_hooks"):
                 phases_impl.run_system_finalizer(ctx)
                 commands = [call.args[1] for call in run.call_args_list]
-                self.assertEqual(commands[:-1], expected)
-                self.assertEqual(commands[-1][0], "/usr/bin/omarchy-apply-system")
+                self.assertEqual(commands[:2], [["pacman-key", "--init"], ["pacman-key", "--populate", "archlinux", "archlinuxcn"]])
+                expected = ["--defer-provisioning"] if deferred else ["--install-user", "alice"]
+                self.assertEqual(commands[2], ["/usr/bin/omarchy-apply-system", *expected, "--first-install"])
+
+    def test_keyring_failure_prevents_enabling_online_repositories(self):
+        self.marker.write_text("cn\n")
+        ctx = types.SimpleNamespace(target=self.target, username="alice", defer_provisioning=False)
+        with mock.patch.object(phases_impl, "_run_target_setup_command", side_effect=RuntimeError("keyring failed")) as run:
+            with self.assertRaisesRegex(RuntimeError, "keyring failed"):
+                phases_impl.run_system_finalizer(ctx)
+            self.assertEqual(run.call_count, 1)
 
 
-class PrepareRegionsTest(unittest.TestCase):
-    def run_prepare(self, regions: Path, root: Path) -> tuple[Path, Path, str]:
-        payload = root / "payload"
-        payload.mkdir()
-        online = root / "online.conf"
-        online.write_text("[core]\nInclude = /etc/pacman.d/mirrorlist\n")
-        stubs = root / "bin"
-        stubs.mkdir()
-        log = root / "calls.log"
-        for name in ("pacman", "pacman-key"):
-            stub = stubs / name
-            stub.write_text(f'#!/bin/bash\necho "{name} $*" >> "{log}"\n')
+class RegionBuildTest(unittest.TestCase):
+    def setUp(self):
+        tmp = tempfile.TemporaryDirectory()
+        self.addCleanup(tmp.cleanup)
+        self.root = Path(tmp.name)
+        self.runtime = self.root / "runtime"
+        self.profile = self.runtime / "default/regions/cn"
+        (self.profile / "pacman").mkdir(parents=True)
+        (self.runtime / "bin").mkdir()
+        (self.runtime / "bin/omarchy-apply-pacman").touch()
+        (self.profile / "packages").write_text("archlinuxcn-keyring\nexample-regional-package\n")
+        (self.profile / "pacman/pacman.conf.append").write_text("[archlinuxcn]\nServer = https://mirrors.ustc.edu.cn/archlinuxcn/$arch\n")
+        (self.profile / "pacman/mirrorlist.append").write_text("Server = https://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch\n")
+        (self.profile / "timezone").write_text("Asia/Shanghai\n")
+        self.iso = self.root / "iso"
+        self.payload = self.iso / "usr/share/omarchy-iso"
+        self.payload.mkdir(parents=True)
+        self.packages = self.payload / "omarchy-base.packages"
+        self.packages.write_text("base\n")
+        self.config = self.root / "pacman.conf"
+        shutil.copyfile(ROOT / "configs/pacman-online-stable.conf", self.config)
+        self.original_config = self.config.read_bytes()
+        self.bin = self.root / "bin"
+        self.bin.mkdir()
+        self.log = self.root / "commands"
+        for command in ("pacman", "pacman-key"):
+            stub = self.bin / command
+            stub.write_text('#!/bin/bash\nprintf "%s %s\\n" "${0##*/}" "$*" >> "$TEST_LOG"\nif [[ ${0##*/} == pacman ]]; then exit "${TEST_PACMAN_STATUS:-0}"; fi\n')
             stub.chmod(0o755)
-        subprocess.run(
-            ["bash", str(ROOT / "builder/prepare-regions.sh"), str(regions), str(payload), str(online)],
-            env={**os.environ, "PATH": f"{stubs}:{os.environ['PATH']}"},
-            check=True, capture_output=True, text=True,
+
+    def prepare(self, region, **env):
+        return subprocess.run(
+            ["bash", str(ROOT / "builder/prepare-region.sh"), region, str(self.runtime), str(self.iso), str(self.config)],
+            env={**os.environ, "PATH": f"{self.bin}:{os.environ['PATH']}", "TEST_LOG": str(self.log), **env},
+            capture_output=True, text=True,
         )
-        return payload, online, log.read_text() if log.exists() else ""
 
-    def test_ships_every_profile_and_bootstraps_its_keyring(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            regions = write_profiles(root)
-            payload, online, calls = self.run_prepare(regions, root)
-            self.assertEqual((payload / "regions/cn/timezones").read_text(), (regions / "cn/timezones").read_text())
-            self.assertIn("[archlinuxcn]", online.read_text())
-            self.assertTrue(online.read_text().startswith("[core]\n"))
-            self.assertEqual(calls.splitlines(), [
-                f"pacman --config {online} --noconfirm -Sy --needed archlinuxcn-keyring",
-                "pacman-key --populate archlinuxcn",
-            ])
+    def test_cn_adds_real_install_targets_and_verifies_keyring_first(self):
+        result = self.prepare("cn")
+        self.assertEqual(result.returncode, 0, result.stderr)
+        self.assertEqual(self.packages.read_text(), "base\n\narchlinuxcn-keyring\nexample-regional-package\n")
+        self.assertEqual(self.config.read_bytes(), self.original_config + b"\n[archlinuxcn]\nServer = https://mirrors.ustc.edu.cn/archlinuxcn/$arch\n")
+        self.assertEqual((self.payload / "region/packages").read_text(), "archlinuxcn-keyring\nexample-regional-package\n")
+        self.assertEqual((self.payload / "region/timezone").read_text(), "Asia/Shanghai\n")
+        self.assertEqual(self.log.read_text().splitlines(), [f"pacman --config {self.config} --noconfirm -Sy --needed archlinuxcn-keyring", "pacman-key --populate archlinuxcn"])
+        with mock.patch.object(phases_impl, "Path", return_value=self.packages), \
+             mock.patch.object(phases_impl, "_package_targets", return_value={"runtime": "omarchy-dev", "settings": "omarchy-settings-dev", "nvim": "omarchy-nvim"}):
+            self.assertEqual(phases_impl._runtime_package_list(None), ["omarchy-dev", "base", "archlinuxcn-keyring", "example-regional-package"])
 
-    def settings_package(self, root: Path, with_regions: bool) -> Path:
-        tree = root / "pkgroot"
-        (tree / "usr/share/omarchy/default/pacman").mkdir(parents=True)
-        if with_regions:
-            write_profiles(root / "src")
-            (root / "src/regions").rename(tree / "usr/share/omarchy/default/regions")
-        package = root / "omarchy-settings-1-1-any.pkg.tar.zst"
-        subprocess.run(["bsdtar", "--zstd", "-cf", str(package), "-C", str(tree), "usr"], check=True)
-        return package
+    def test_global_is_unchanged_without_region_support_in_runtime(self):
+        shutil.rmtree(self.runtime)
+        result = self.prepare("global")
+        self.assertEqual(result.returncode, 0, result.stderr)
+        self.assertEqual(self.packages.read_text(), "base\n")
+        self.assertEqual(self.config.read_bytes(), self.original_config)
+        self.assertFalse(self.log.exists())
+        self.assertFalse((self.payload / "region").exists())
 
-    def test_published_build_reads_profiles_from_the_settings_package(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            payload, online, calls = self.run_prepare(self.settings_package(root, with_regions=True), root)
-            self.assertEqual((payload / "regions/cn/packages").read_text(), "# keyring first\narchlinuxcn-keyring\nextra-tool\n")
-            self.assertIn("[archlinuxcn]", online.read_text())
-            self.assertIn("pacman-key --populate archlinuxcn", calls)
+    def test_missing_runtime_support_fails_before_package_operations(self):
+        (self.runtime / "bin/omarchy-apply-pacman").unlink()
+        result = self.prepare("cn")
+        self.assertNotEqual(result.returncode, 0)
+        self.assertIn("--local-source", result.stderr)
+        self.assertFalse(self.log.exists())
+        self.assertEqual(self.config.read_bytes(), self.original_config)
 
-    def test_settings_package_without_profiles_builds_a_global_iso(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            payload, online, calls = self.run_prepare(self.settings_package(root, with_regions=False), root)
-            self.assertFalse((payload / "regions").exists())
-            self.assertEqual(calls, "")
+    def test_profile_without_user_defaults_is_supported(self):
+        result = self.prepare("cn")
+        self.assertEqual(result.returncode, 0, result.stderr)
+        self.assertFalse((self.payload / "region/skel").exists())
 
-    def test_unreadable_settings_package_fails_the_build(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            package = root / "omarchy-settings-1-1-any.pkg.tar.zst"
-            package.write_text("not an archive")
-            with self.assertRaises(subprocess.CalledProcessError):
-                self.run_prepare(package, root)
+    def test_untrusted_keyring_aborts_without_importing_keys(self):
+        result = self.prepare("cn", TEST_PACMAN_STATUS="1")
+        self.assertNotEqual(result.returncode, 0)
+        self.assertNotIn("pacman-key", self.log.read_text())
 
-    def test_runtime_without_profiles_builds_a_global_iso(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            payload, online, calls = self.run_prepare(root / "missing", root)
-            self.assertFalse((payload / "regions").exists())
-            self.assertNotIn("archlinuxcn", online.read_text())
-            self.assertEqual(calls, "")
+
+class RegionMakeTest(unittest.TestCase):
+    def setUp(self):
+        tmp = tempfile.TemporaryDirectory()
+        self.addCleanup(tmp.cleanup)
+        self.root = Path(tmp.name)
+        (self.root / "bin").mkdir()
+        shutil.copyfile(ROOT / "bin/omarchy-iso-make", self.root / "bin/omarchy-iso-make")
+        for directory in ("configs/airootfs/root", "configs/airootfs/usr/local/bin", "stubs"):
+            (self.root / directory).mkdir(parents=True)
+        (self.root / "configs/profiledef.sh").touch()
+        self.log = self.root / "docker-args"
+        stubs = {
+            "git": '#!/bin/bash\nexit 0\n',
+            "sudo": '#!/bin/bash\necho "unexpected sudo" >&2\nexit 99\n',
+            "docker": '''#!/bin/bash
+if [[ $1 == version ]]; then exit 0; fi
+printf '%s\\n' "$@" > "$TEST_LOG"
+for arg in "$@"; do
+  if [[ $arg == *:/out/ ]]; then touch "${arg%:/out/}/omarchy-test-x86_64.iso"; fi
+done
+''',
+        }
+        for name, content in stubs.items():
+            stub = self.root / "stubs" / name
+            stub.write_text(content)
+            stub.chmod(0o755)
+
+    def make(self, *args):
+        env = {key: value for key, value in os.environ.items() if not key.startswith("OMARCHY_")}
+        return subprocess.run(
+            ["bash", "bin/omarchy-iso-make", "--keep-pkg-cache", "--no-boot-offer", *args],
+            cwd=self.root, env={**env, "HOME": str(self.root), "PATH": f"{self.root / 'stubs'}:{env['PATH']}", "TEST_LOG": str(self.log), "TEST_ROOT": str(self.root)},
+            capture_output=True, text=True,
+        )
+
+    def test_region_is_independent_of_channel_and_names_cache_and_artifact(self):
+        for flags, channel, ref in (([], "stable", "quattro"), (["--rc"], "rc", "rc"), (["--edge"], "edge", "edge"), (["--dev"], "edge", "dev")):
+            with self.subTest(channel=ref):
+                release = self.root / "release"
+                if release.exists():
+                    shutil.rmtree(release)
+                result = self.make(*flags, "--region", "cn")
+                self.assertEqual(result.returncode, 0, result.stderr)
+                args = self.log.read_text().splitlines()
+                self.assertIn("OMARCHY_REGION=cn", args)
+                self.assertIn(f"OMARCHY_MIRROR={channel}", args)
+                self.assertIn(f"OMARCHY_ISO_REF={ref}", args)
+                self.assertIn(f"{self.root}/.cache/omarchy/iso_{channel}-cn/airootfs/var/cache/omarchy:/var/cache/airootfs/var/cache/omarchy", args)
+                self.assertTrue((release / f"omarchy-test-x86_64-{ref}-cn.iso").exists())
+
+    def test_default_preserves_existing_global_cache_and_name(self):
+        result = self.make()
+        self.assertEqual(result.returncode, 0, result.stderr)
+        self.assertIn("OMARCHY_REGION=global", self.log.read_text().splitlines())
+        self.assertIn("/iso_stable/", self.log.read_text())
+        self.assertTrue((self.root / "release/omarchy-test-x86_64-quattro.iso").exists())
+
+    def test_build_renames_only_its_own_iso(self):
+        release = self.root / "release"
+        release.mkdir()
+        other = release / "omarchy-other-x86_64.iso"
+        other.touch()
+        result = self.make("--region", "cn")
+        self.assertEqual(result.returncode, 0, result.stderr)
+        self.assertTrue(other.exists())
+        self.assertTrue((release / "omarchy-test-x86_64-quattro-cn.iso").exists())
+        self.assertEqual(list(release.glob(".build-*")), [])
+
+    def test_local_source_keeps_region_and_mounts_both_checkouts(self):
+        for name in ("runtime", "packages"):
+            (self.root / name).mkdir()
+        result = self.make("--region", "cn", "--local-source", str(self.root / "runtime"), str(self.root / "packages"))
+        self.assertEqual(result.returncode, 0, result.stderr)
+        args = self.log.read_text().splitlines()
+        self.assertIn("OMARCHY_REGION=cn", args)
+        self.assertIn("OMARCHY_ISO_REF=local", args)
+        self.assertIn(f"{self.root}/runtime:/omarchy-source:ro", args)
+        self.assertIn(f"{self.root}/packages:/omarchy-pkgs:ro", args)
+        self.assertTrue((self.root / "release/omarchy-test-x86_64-local-cn.iso").exists())
+
+    def test_invalid_regions_fail_without_starting_build(self):
+        for flags in (("--region",), ("--region", "chn"), ("--region", "CN"), ("--region", "zz"), ("--region", "../cn")):
+            with self.subTest(flags=flags):
+                result = self.make(*flags)
+                self.assertNotEqual(result.returncode, 0)
+                self.assertFalse(self.log.exists())
+                self.assertFalse((self.root / "release").exists())
+
+
+
+class ConfiguratorRegionTimezoneTest(unittest.TestCase):
+    """The configurator hands the ISO's regional timezone to the setup form."""
+
+    def setUp(self):
+        configurator = (ROOT / "configs/airootfs/root/configurator").read_text()
+        helper = re.search(r"^region_timezone\(\) \{\n.*?^\}", configurator, re.M | re.S)
+        self.assertIsNotNone(helper)
+        self.helper = helper.group(0)
+        self.configurator = configurator
+        tmp = tempfile.TemporaryDirectory()
+        self.addCleanup(tmp.cleanup)
+        self.file = Path(tmp.name) / "timezone"
+
+    def region_timezone(self):
+        return subprocess.run(
+            ["bash", "-c", f"set -euo pipefail\n{self.helper}\nregion_timezone"],
+            env={**os.environ, "REGION_TIMEZONE": str(self.file)},
+            capture_output=True, text=True, check=True,
+        ).stdout
+
+    def test_global_iso_offers_no_timezone(self):
+        self.assertEqual(self.region_timezone(), "")
+
+    def test_regional_iso_offers_its_profile_timezone(self):
+        self.file.write_text("Asia/Shanghai\n")
+        self.assertEqual(self.region_timezone(), "Asia/Shanghai\n")
+
+    def test_user_form_passes_it_to_the_timezone_prompt(self):
+        self.assertIn('omarchy_prompt_timezone "$(region_timezone)"', self.configurator)
 
 
 if __name__ == "__main__":