David Heinemeier HanssonandClaude Opus 5
8858ac2544
The keyboard layout list, the account and hostname validation rules, and the gum prompts that ask for them existed here and again in the runtime's first-boot owner setup, with nothing keeping the copies honest. They had already drifted: dropping two layouts from this list moved English (US) from the top of one gum choose page to the bottom of the previous one, leaving the preselected default pinned under a screenful of layouts. The form now lives in the runtime at install/provisioning/setup-form.sh, and build-iso.sh vendors it out of the very runtime package this ISO bundles — the same two-branch machinery already used for omarchy-base.packages, so a --local-source build takes it from the mounted checkout and everything else extracts it from the downloaded package. An ISO therefore ships the form belonging to the runtime it installs. That file is extracted on its own rather than alongside the package lists: bsdtar exits non-zero for a member it cannot find, so bundling the request would abort the build under set -e with a bare "Not found in archive" instead of the actionable error about publishing a runtime that carries the form. Cancel handling is unified with first-boot setup, which is what made the prompts shareable. Every prompt reports 0 (answered), 1 (Esc), or 130 (Ctrl+C). Esc now unwinds to the start of the form instead of ending the install — it previously hit the same `|| abort` as Ctrl+C. Ctrl+C keeps both of its hidden affordances: arming deferred provisioning on the first keyboard screen, and toggling unencrypted on the disk screens. test_keyboard.py reads the layout list from a runtime checkout now, and skips its localectl coverage rather than failing when there is none to read. Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
64 lines
2.3 KiB
Python
64 lines
2.3 KiB
Python
"""Offline target keyboard configuration.
|
|
|
|
archinstall's set_keyboard_language boots the installed system in a
|
|
systemd-nspawn container just to run localectl. systemd-firstboot --root
|
|
produces the part of that output Omarchy actually consumes — KEYMAP for the
|
|
console plus the XKB* settings in vconsole.conf that omarchy's
|
|
detect-keyboard-layout.sh copies into Hyprland's kb_layout — without booting
|
|
anything. The Xorg 00-keyboard.conf that localectl also writes is not
|
|
generated: nothing on an Omarchy system reads it.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
|
|
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.
|
|
"""
|
|
if not language.strip():
|
|
return True
|
|
|
|
result = subprocess.run(
|
|
["localectl", "--no-pager", "list-keymaps"],
|
|
check=False,
|
|
text=True,
|
|
capture_output=True,
|
|
)
|
|
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()}:
|
|
return False
|
|
|
|
# systemd-firstboot --force rewrites vconsole.conf wholesale, dropping the
|
|
# FONT= line archinstall's set_vconsole wrote earlier.
|
|
vconsole_path = target / "etc" / "vconsole.conf"
|
|
font = None
|
|
if vconsole_path.exists():
|
|
font = next(
|
|
(line for line in vconsole_path.read_text().splitlines() if line.startswith("FONT=")),
|
|
None,
|
|
)
|
|
|
|
result = subprocess.run(
|
|
["systemd-firstboot", f"--root={target}", f"--keymap={language}", "--force"],
|
|
check=False,
|
|
text=True,
|
|
capture_output=True,
|
|
)
|
|
if result.returncode != 0:
|
|
detail = result.stderr.strip() or "systemd-firstboot returned an error"
|
|
raise RuntimeError(f"Unable to configure keyboard layout {language}: {detail}")
|
|
|
|
if font:
|
|
vconsole_path.write_text(vconsole_path.read_text() + font + "\n")
|
|
|
|
return True
|