* Unify input methods with the installer keyboard selection * Preserve inherited input keys and later keyboard changes * Exercise input engines across desktop toolkits * Show input modes in the keyboard indicator * Keep Pinyin setup prompts visible * Remember input selections before an app gains focus * Remove the Japanese input welcome notification * Show explicit choices on notification cards * Suppress the Cloudpinyin first-use prompt * Show the input switching shortcut in keyboard hints * Verify input setup and composition stay quiet * Use Super+I for input switching independently of Fcitx keys * Restore linked input settings and attribute test notifications to Fcitx * Correct the input setup shortcut hint * Keep input tooltips to the name and switching shortcut * Place the input language selector with the right bar widgets * Show input switching only for multiple layouts or methods * Unify input method and keyboard layout switching * Select keyboard layouts and input methods in the Typing menu * Apply typing selections immediately from the menu * Use installer keyboard choices and keep typing selections accurate * Queue typing changes and wait for saved selections * Keep queued typing selections when reopening the menu * Cycle keyboard layouts alongside composition engines * Avoid shadowing Python typing and retain pending mixed input selections * Keep input clicks working through controller and compositor failures * Move the keyboard layout widget to the right side of existing bars Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Map keyboard choices to the layouts the installer sets Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep the switching order when changing input methods Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Set input method fonts only after the selection saves Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Restore confirmed picker checks when an immediate change fails Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Route Super+I through the shell's input reader so unfocused choices stick Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Restore the input group when the font preference cannot be written Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Drop the azerty conversion now that the installer no longer offers it Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Apply the owner's keyboard layout once before persisting the input choice A quattro merge kept a second apply_keyboard after the retry loop, which re-ran loadkeys and firstboot, ignored their failure, and overwrote the XKB layout setup supplies for keymaps kbd-model-map lacks. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Give the Lao keyboard choice a Lao desktop layout The row used la-latin1, kbd's Latin American Spanish keymap, so Lao installs typed Spanish. There is no Lao console keymap; like Korean, the console stays US and the desktop gets la, which Omarchy keeps behind US as a non-Latin layout. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Load engines installed after Fcitx started when they are selected The Typing menu refused an engine whose package an update had installed, since Fcitx discovers engines only at startup. Restart input once and wait for the engine; name the package when it really is not installed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Cycle input methods back with Super+Shift+I Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Drop notification action buttons now that the Pinyin prompt is suppressed Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Cycle input only through the shell's reader Without the shell there is no bar or menu either, so the one-shot cycling path only duplicated the reader's logic. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Add engines from the command line through the Typing menu's path omarchy setup input <engine> had its own restart, append, select and live-rollback code in configure.py, parallel to the menu's. It now installs the packages and appends through typing_setup, leaving configure.py with install-time seeding and update defaults. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep Ctrl+Space out of Fcitx's toggles instead of probing for it The terminal prefix bind read the Fcitx config and profile on every press to avoid fighting a Ctrl+Space toggle. configure --defaults now removes that key from every trigger list, so the bind only checks for a terminal. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Run the input-method scripts with the system Python A bare python resolves through PATH, so a mise, pyenv or venv interpreter could run them without the system's PyGObject. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
202 lines
7.7 KiB
Bash
202 lines
7.7 KiB
Bash
# The setup form: every question Omarchy asks a human to describe their machine
|
|
# — keyboard, account, hostname, timezone — plus the rules those answers are
|
|
# checked against. Shared by the two places that ask them: the ISO
|
|
# configurator's user step and this package's first-boot owner setup
|
|
# (omarchy-provision-owner). Sourced by both, so the copies cannot drift the way
|
|
# the keyboard list already did.
|
|
#
|
|
# Every prompt reports one of three statuses, and both callers read them the
|
|
# same way:
|
|
#
|
|
# 0 field is set, move on
|
|
# 1 Esc — unwind to the start of the form
|
|
# 130 Ctrl+C — a per-caller side channel (the installer arms deferred
|
|
# provisioning or toggles encryption; first-boot setup offers a reboot)
|
|
#
|
|
# gum is the reason those two are the whole vocabulary: Esc and Ctrl+C are the
|
|
# 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>` 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
|
|
|
|
# The English layouts lead, then everything else alphabetically. gum choose
|
|
# paginates in --height-sized pages and jumps to the page holding --selected,
|
|
# so an alphabetical English (US) landed deep enough to sit alone at the edge
|
|
# of a page of layouts nobody scanning for it reads. Up here the default and
|
|
# its variants are the first thing on screen no matter how the list grows.
|
|
OMARCHY_KEYBOARD_LAYOUTS=$'English (US)|us
|
|
English (UK)|uk
|
|
English (US, Dvorak)|dvorak
|
|
English (US, Colemak)|colemak
|
|
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
|
|
Dutch|nl
|
|
Estonian|et
|
|
Finnish|fi
|
|
French|fr
|
|
French (Canada)|cf
|
|
French (Switzerland)|fr_CH
|
|
Georgian|ge
|
|
German|de
|
|
German (Switzerland)|de_CH-latin1
|
|
Greek|gr
|
|
Hebrew|il
|
|
Hungarian|hu
|
|
Icelandic|is-latin1
|
|
Irish|ie
|
|
Italian|it
|
|
Japanese|jp106|mozc
|
|
Japanese (US keyboard)|us|mozc
|
|
Kazakh|kazakh
|
|
Korean|us|hangul|kr
|
|
Kyrgyz|kyrgyz
|
|
Lao|us||la
|
|
Latvian|lv
|
|
Lithuanian|lt
|
|
Macedonian|mk-utf
|
|
Norwegian|no-latin1
|
|
Polish|pl
|
|
Portuguese|pt-latin1
|
|
Portuguese (Brazil)|br-abnt2
|
|
Romanian|ro
|
|
Russian|ru
|
|
Serbian|sr-latin
|
|
Slovak|sk-qwertz
|
|
Slovenian|slovene
|
|
Spanish|es
|
|
Spanish (Latin American)|la-latin1
|
|
Swedish|sv-latin1
|
|
Tajik|tj_alt-UTF8
|
|
Turkish|trq
|
|
Ukrainian|ua'
|
|
|
|
OMARCHY_USERNAME_PATTERN='^[a-z_][a-z0-9_-]*[$]?$'
|
|
OMARCHY_RESERVED_USERNAMES='^(root|bin|daemon|mail|ftp|http|nobody|dbus|systemd-coredump|systemd-network|systemd-oom|systemd-journal-remote|systemd-resolve|systemd-timesync|tss|uuidd|alpm|git|avahi|cups|cups-browsed|lp|_talkd|polkitd|rtkit|qemu|brltty|gluster|rpc|libvirt-qemu|pcscd|nvidia-persistenced|sddm)$'
|
|
OMARCHY_HOSTNAME_PATTERN='^[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?$'
|
|
OMARCHY_HOSTNAME_DEFAULT='omarchy'
|
|
|
|
# Installer targets are empty, so any account is fair game; first-boot setup
|
|
# overrides this because its machine already has users.
|
|
omarchy_username_taken() { return 1; }
|
|
|
|
# `x=$(gum ...) && status=0 || status=$?` rather than a bare assignment followed
|
|
# by `status=$?`: one caller runs under `set -e`, where a cancelled prompt is a
|
|
# failing assignment that would kill the script before the status is read.
|
|
|
|
omarchy_prompt_keyboard() {
|
|
local choice status
|
|
choice=$(printf '%s\n' "$OMARCHY_KEYBOARD_LAYOUTS" | cut -d'|' -f1 |
|
|
gum choose --height 10 --selected "English (US)" --header "Select keyboard layout") && status=0 || status=$?
|
|
((status == 0)) || return $status
|
|
|
|
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 | la) ;; *) 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() {
|
|
local status
|
|
while true; do
|
|
username=$(gum input --placeholder "Alphanumeric without spaces (like dhh)" --prompt.foreground="#845DF9" --prompt "Username> ") && status=0 || status=$?
|
|
((status == 0)) || return $status
|
|
|
|
if [[ "$username" =~ $OMARCHY_USERNAME_PATTERN ]]; then
|
|
if [[ "$username" =~ $OMARCHY_RESERVED_USERNAMES ]]; then
|
|
notice "Username is reserved for system" 1
|
|
elif omarchy_username_taken "$username"; then
|
|
notice "That username already exists on this machine" 1
|
|
else
|
|
return 0
|
|
fi
|
|
else
|
|
notice "Username must be alphanumeric with no spaces" 1
|
|
fi
|
|
done
|
|
}
|
|
|
|
omarchy_prompt_password() {
|
|
local status
|
|
while true; do
|
|
password=$(gum input --placeholder "Used for user + root, and disk encryption when enabled" --prompt.foreground="#845DF9" --password --prompt "Password> ") && status=0 || status=$?
|
|
((status == 0)) || return $status
|
|
password_confirmation=$(gum input --placeholder "Must match the password you just typed" --prompt.foreground="#845DF9" --password --prompt "Confirm> ") && status=0 || status=$?
|
|
((status == 0)) || return $status
|
|
|
|
if [[ -n "$password" && "$password" == "$password_confirmation" ]]; then
|
|
return 0
|
|
elif [[ -z "$password" ]]; then
|
|
notice "Your password can't be blank!" 1
|
|
else
|
|
notice "Passwords didn't match!" 1
|
|
fi
|
|
done
|
|
}
|
|
|
|
# Both fields are skippable with Return, so an empty value is a real answer and
|
|
# only Esc/Ctrl+C end the prompt early.
|
|
omarchy_prompt_identity() {
|
|
local status
|
|
full_name=$(gum input --placeholder "Used for git authentication (hit return to skip)" --prompt.foreground="#845DF9" --prompt "Full name> ") && status=0 || status=$?
|
|
((status == 0)) || return $status
|
|
email_address=$(gum input --placeholder "Used for git authentication (hit return to skip)" --prompt.foreground="#845DF9" --prompt "Email address> ") && status=0 || status=$?
|
|
return $status
|
|
}
|
|
|
|
omarchy_prompt_hostname() {
|
|
local status
|
|
while true; do
|
|
hostname=$(gum input --placeholder "Letters, digits, and dashes (or return for 'omarchy')" --prompt.foreground="#845DF9" --prompt "Hostname> ") && status=0 || status=$?
|
|
((status == 0)) || return $status
|
|
|
|
if [[ -z $hostname ]]; then
|
|
hostname="$OMARCHY_HOSTNAME_DEFAULT"
|
|
return 0
|
|
elif [[ "$hostname" =~ $OMARCHY_HOSTNAME_PATTERN ]]; then
|
|
return 0
|
|
else
|
|
notice "Hostname must be 1-63 letters, digits, or dashes, and cannot start or end with a dash" 1
|
|
fi
|
|
done
|
|
}
|
|
|
|
# A fresh machine often hasn't joined a network yet, so the geo guess fails
|
|
# often; guard it or a `set -e` caller dies before the filter fallback.
|
|
omarchy_prompt_timezone() {
|
|
local guess status
|
|
guess=$(tzupdate -p 2>/dev/null) || guess=""
|
|
|
|
if [[ -n $guess ]]; then
|
|
timezone=$(timedatectl list-timezones | gum choose --height 10 --selected "$guess" --header "Timezone") && status=0 || status=$?
|
|
else
|
|
timezone=$(timedatectl list-timezones | gum filter --height 10 --header "Timezone") && status=0 || status=$?
|
|
fi
|
|
((status == 0)) || return $status
|
|
|
|
[[ -n $timezone ]] || timezone="UTC"
|
|
}
|