From 59ae21491985307aa8149aa10c666aace823e8b7 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 12 Sep 2024 17:15:14 +0200 Subject: [PATCH] Fix issue that prevented keyboard layout from applying during Calamares installation The calamares-nixos package has a fix for setting the keyboard layout through gsettings but this patch is only applied in the code path used when Calamares is not relying on systemd's localed to set the keymap. Configuring Calamares to not use locale1 forces it to go through the code path that uses xkbmap and that has the nixos specific patch. This can probably be done more cleanly upstream but we're not sure we'll keep using the Calamares installer for deskOS anyway. --- packages/calamares-extensions/config/modules/keyboard.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/calamares-extensions/config/modules/keyboard.conf b/packages/calamares-extensions/config/modules/keyboard.conf index 32e7cda..841a9aa 100644 --- a/packages/calamares-extensions/config/modules/keyboard.conf +++ b/packages/calamares-extensions/config/modules/keyboard.conf @@ -17,3 +17,5 @@ xOrgConfFileName: "/etc/X11/xorg.conf.d/00-keyboard.conf" # found on Debian-related systems. # Defaults to true if nothing is set. writeEtcDefaultKeyboard: false + +useLocale1: false