fix(setup): point setup-keyboard at the provisioning form - #409
Open
duketopceo wants to merge 1 commit into
Open
fix(setup): point setup-keyboard at the provisioning form#409duketopceo wants to merge 1 commit into
duketopceo wants to merge 1 commit into
Conversation
omarchy setup keyboard still looked for install/first-run/keyboard-layout.sh, which "Make setup ISO-only" removed, so the command exited with a missing script error. Source the shared setup-form picker instead and persist the choice through localectl, landing KEYMAP/XKBLAYOUT in vconsole.conf where default/hypr/input.lua already reads them; a hyprctl reload applies the layout to the running session. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #408.
omarchy setup keyboardstill looked forinstall/first-run/keyboard-layout.sh, which75cb4f7("Make setup ISO-only") removed, so the command exited with a missing-script error and no picker ever appeared.The rewrite sources
install/provisioning/setup-form.sh— the same layout table andgumpicker first-boot provisioning uses, so the command can never offer a layout setup could not apply — then persists the choice throughlocalectl:localectl set-keymapwritesKEYMAP=for the consolelocalectl --no-convert set-x11-keymapwritesXKBLAYOUT/XKBVARIANTto/etc/vconsole.confand the xorg drop-indefault/hypr/input.luaalready readsXKBLAYOUTfromvconsole.conf, so ahyprctl reloadapplies the layout to the running session — no relaunch neededBoth calls go through polkit, so the active session user needs no sudo (verified on a 4.0.3-1 package install). Also drops the hardcoded
$HOME/.local/share/omarchypath for$OMARCHY_PATHwith the standard/usr/share/omarchyfallback — the old default made the error message point at a path that only exists on dev checkouts.Test plan
tests/test-setup-keyboard.shstubs gum/localectl/hyprctl: UK pick persistsuk+gb, Dvorak passes the variant through, cancel writes nothing (6/6 pass)./test/allgreen (3 unrelated env failures — noomarchy-pkgscheckout here)bin/omarchy commands --checkpasses (465 commands)Generated with Devin