From 6da93140909ce9a8991a783ac5049ea9b41413ec Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Sun, 24 Oct 2021 21:29:24 +0200 Subject: [PATCH] don't try setting x11keyboard layout in 00-keyboard.conf if sway edition is chosen, since sway does not even use that file. Should fix #41 Signed-off-by: Dan Johansen --- manjaro-arm-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 7adaecc..f597dd4 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -193,7 +193,7 @@ create_install() { echo "LANG=$LOCALE" | tee --append $TMPDIR/root/etc/locale.conf 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root locale-gen echo "KEYMAP=$CLIKEYMAP" | tee --append $TMPDIR/root/etc/vconsole.conf 1> /dev/null 2>&1 - if [[ "$EDITION" != "minimal" ]] && [[ "$EDITION" != "server" ]]; then + if [[ "$EDITION" != "minimal" ]] && [[ "$EDITION" != "server" ]] && [[ "$EDITION" != "sway" ]]; then echo 'Section "InputClass"' > $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf echo 'Identifier "system-keyboard"' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf echo 'Option "XkbLayout" "us"' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf