Merge #14433 input methods and remove Rime

The keyboard choice and omarchy-setup-input own Chinese input now. The
new passwordless sudo and input tooltips get Chinese text.

install/config/region.sh

@@ -23,8 +23,6 @@ global)
   done
   ;;
 cn)
-  # Packages first, so a failed install leaves the machine Global.
-  omarchy-pkg-add fcitx5-configtool fcitx5-rime librime opencc rime-ice-installer
   for link in "${cn_links[@]}"; do
     read -r _ target <<<"$link"
     if [[ -e $target && ! -L $target ]]; then

install/hardware/all.sh

@@ -18,6 +18,7 @@ run_logged "$OMARCHY_INSTALL/hardware/intel/ipu7-camera.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/fred.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/fix-wifi7-eht.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/sof-firmware.sh"
+run_logged "$OMARCHY_INSTALL/hardware/dell-xps13-ptl-speaker-firmware.sh"
 
 run_logged "$OMARCHY_INSTALL/hardware/fix-elgato-camlink-4k.sh"
 

install/hardware/dell-xps13-ptl-speaker-firmware.sh

@@ -0,0 +1,3 @@
+if omarchy-hw-dell-xps13-dx13260-ptl; then
+  omarchy-pkg-add linux-firmware-cirrus-dx13260
+fi

install/omarchy-base.packages

@@ -21,12 +21,12 @@ cups
 cups-filters
 cups-pk-helper
 ddcutil
+disktree-bin
 docker
 docker-buildx
 docker-compose
 dosfstools
 dotnet-runtime
-dua-cli
 evince
 exfatprogs
 expac
@@ -34,7 +34,11 @@ eza
 fakeroot
 fastfetch
 fcitx5
+fcitx5-chewing
+fcitx5-chinese-addons
 fcitx5-gtk
+fcitx5-hangul
+fcitx5-mozc
 fcitx5-qt
 fd
 ffmpeg

install/omarchy-other.packages

@@ -72,11 +72,3 @@ t2fanrd
 
 # Framework 16
 qmk-hid
-
-# China region input method (install/config/region.sh)
-dialog
-fcitx5-configtool
-fcitx5-rime
-librime
-opencc
-rime-ice-installer

install/provisioning/setup-form.sh

@@ -17,7 +17,10 @@
 # only keys any gum widget exits on, and Ctrl+C arrives as a byte in raw mode,
 # so it never reaches the shell as SIGINT. Act on the status, never on a trap.
 #
-# Callers supply `notice <message> <seconds>` and set every variable these prompts write.
+# Callers supply `notice <message> <seconds>` for validation feedback, and set
+# the variables these prompts write: keyboard, keyboard_label,
+# keyboard_input_method, keyboard_xkb_layout, username,
+# password, password_confirmation, full_name, email_address, hostname, timezone.
 
 OMARCHY_FORM_BACK=1
 OMARCHY_FORM_SIGNAL=130
@@ -35,6 +38,8 @@ Azerbaijani|azerty
 Belarusian|by
 Belgian|be-latin1
 Bulgarian|bg-cp1251
+Chinese (Simplified, Pinyin)|us|pinyin
+Chinese (Traditional, Zhuyin)|us|chewing
 Croatian|croat
 Czech|cz
 Danish|dk-latin1
@@ -53,8 +58,10 @@ Hungarian|hu
 Icelandic|is-latin1
 Irish|ie
 Italian|it
-Japanese|jp106
+Japanese|jp106|mozc
+Japanese (US keyboard)|us|mozc
 Kazakh|kazakh
+Korean|us|hangul|kr
 Kyrgyz|kyrgyz
 Lao|la-latin1
 Latvian|lv
@@ -146,8 +153,22 @@ omarchy_prompt_keyboard() {
     gum choose --height 10 --selected "English (US)" --header "$(omarchy_text "Select keyboard layout")") && status=0 || status=$?
   ((status == 0)) || return $status
 
-  keyboard_label="$choice"
-  keyboard=$(printf '%s\n' "$OMARCHY_KEYBOARD_LAYOUTS" | awk -F'|' -v c="$choice" '$1==c{print $2; exit}')
+  local selection
+  selection=$(printf '%s\n' "$OMARCHY_KEYBOARD_LAYOUTS" | awk -F'|' -v c="$choice" '$1==c{print; exit}')
+  [[ -n $selection ]] || return 1
+  IFS='|' read -r keyboard_label keyboard keyboard_input_method keyboard_xkb_layout <<< "$selection"
+  keyboard_input_method=${keyboard_input_method:-none}
+  keyboard_xkb_layout=${keyboard_xkb_layout:-}
+}
+
+# Root-side persistence. Console keymaps remain real keymaps; the input
+# preference survives separately for every user of the installed system.
+omarchy_persist_input_selection() {
+  local target_root=${1:-} method=${keyboard_input_method:-none} layout=${keyboard_xkb_layout:-}
+  case "$method" in none | mozc | hangul | pinyin | chewing) ;; *) return 1 ;; esac
+  case "$layout" in "" | kr) ;; *) return 1 ;; esac
+  mkdir -p "$target_root/etc/omarchy"
+  printf 'INPUT_METHOD=%s\nXKB_LAYOUT=%s\n' "$method" "$layout" > "$target_root/etc/omarchy/input-method"
 }
 
 omarchy_prompt_username() {

install/user/all.sh

@@ -2,6 +2,7 @@ run_logged "$OMARCHY_INSTALL/user/theme.sh"
 run_logged "$OMARCHY_INSTALL/user/chromium.sh"
 run_logged "$OMARCHY_INSTALL/user/git.sh"
 run_logged "$OMARCHY_INSTALL/user/xcompose.sh"
+run_logged "$OMARCHY_INSTALL/user/input-method.sh"
 run_logged "$OMARCHY_INSTALL/user/mise-work.sh"
 
 run_logged "$OMARCHY_INSTALL/user/hardware/asus/fix-audio-mixer.sh"
@@ -13,4 +14,3 @@ run_logged "$OMARCHY_INSTALL/user/hardware/vm-no-animations.sh"
 
 run_logged "$OMARCHY_INSTALL/user/default-keyring.sh"
 run_logged "$OMARCHY_INSTALL/user/mise.sh"
-run_logged "$OMARCHY_INSTALL/user/region.sh"

install/user/first-run/enable-user-units.sh

@@ -11,6 +11,8 @@
 
 set -euo pipefail
 
+omarchy-input-method configure --defaults || echo "Input method defaults deferred; run omarchy setup input after login." >&2
+
 systemctl --user daemon-reload
 systemctl --user enable --now \
   bt-agent.service \

install/user/input-method.sh

@@ -0,0 +1 @@
+omarchy-input-method configure --seed

install/user/region.sh

@@ -1,9 +0,0 @@
-region=$(omarchy-region)
-
-if [[ $region == "China" ]]; then
-  if [[ $OMARCHY_SETUP_CONTEXT == "iso-chroot" ]]; then
-    rime-ice-installer --yes --asset-dir /opt/packages/rime-ice
-  else
-    echo "Skipping Rime Ice setup in $OMARCHY_SETUP_CONTEXT: only the ISO bundles its assets"
-  fi
-fi