From e891e5c22fee407c8ce8c6562d09a7c49109e978 Mon Sep 17 00:00:00 2001 From: Zeus-Deus Date: Sun, 12 Jul 2026 08:00:13 -0700 Subject: [PATCH] Bundle vconsole.conf in the initramfs so Plymouth uses the right keymap at the LUKS prompt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plymouth 26 reads the keyboard layout from /etc/vconsole.conf, but the keymap hook only bakes in the compiled keymap.bin, not the config file, so the LUKS prompt falls back to US QWERTY. Add FILES+=(/etc/vconsole.conf) to omarchy_hooks.conf so the initramfs carries it. New installs pick it up via limine-snapper.sh; existing installs get it through a migration that rebuilds the UKI. Additive — keymap.bin is unchanged, so no extra lockout risk. Closes #6183. Related to #6151 and #6072. Co-Authored-By: Claude Opus 4.8 (1M context) --- install/login/limine-snapper.sh | 1 + migrations/1783355853.sh | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 migrations/1783355853.sh diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh index ce9fffbb..935f746e 100644 --- a/install/login/limine-snapper.sh +++ b/install/login/limine-snapper.sh @@ -1,6 +1,7 @@ if command -v limine &>/dev/null; then sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf </dev/null HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs) +FILES+=(/etc/vconsole.conf) EOF sudo tee /etc/mkinitcpio.conf.d/thunderbolt_module.conf </dev/null MODULES+=(thunderbolt) diff --git a/migrations/1783355853.sh b/migrations/1783355853.sh new file mode 100644 index 00000000..6c44856f --- /dev/null +++ b/migrations/1783355853.sh @@ -0,0 +1,11 @@ +echo "Bundle the console keymap into the initramfs so Plymouth uses the right keyboard layout at the LUKS prompt" + +HOOKS_CONF="/etc/mkinitcpio.conf.d/omarchy_hooks.conf" + +if [[ -f $HOOKS_CONF ]] && ! grep -q '/etc/vconsole.conf' "$HOOKS_CONF"; then + echo "FILES+=(/etc/vconsole.conf)" | sudo tee -a "$HOOKS_CONF" >/dev/null + + if omarchy-cmd-present limine-mkinitcpio; then + sudo limine-mkinitcpio + fi +fi