diff --git a/.install/keyboard.sh b/.install/keyboard.sh index 50f1abf..7069c50 100755 --- a/.install/keyboard.sh +++ b/.install/keyboard.sh @@ -26,20 +26,27 @@ if [ "$setkeyboard" == "0" ] ;then # Default layout and variants keyboard_layout="us" + keyboard_variant="" _setupKeyboardLayout() { - echo keyboard_layout=$(localectl list-x11-keymap-layouts | gum filter --height 15 --placeholder "Find your keyboard layout...") - echo echo ":: Keyboard layout changed to $keyboard_layout" - echo + _setupKeyboardVariant + } + + _setupKeyboardVariant() { + if gum confirm "Do you want to set a variant of the keyboard?" ; then + keyboard_variant=$(localectl list-x11-keymap-variants | gum filter --height 15 --placeholder "Find your keyboard layout...") + echo ":: Keyboard variant changed to $keyboard_variant" + fi _confirmKeyboard } _confirmKeyboard() { - + echo echo "Current selected keyboard setup:" echo "Keyboard layout: $keyboard_layout" + echo "Keyboard variant: $keyboard_variant" echo if gum confirm "Do you want proceed with this keyboard setup?" --affirmative "Proceed" --negative "Change" ;then return 0 @@ -67,6 +74,10 @@ if [ "$setkeyboard" == "0" ] ;then REPLACE="$keyboard_layout" sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf + SEARCH="KEYBOARD_VARIANT" + REPLACE="$keyboard_variant" + sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf + SEARCH="KEYBOARD_LAYOUT" REPLACE="$keyboard_layout" sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/autostart.sh diff --git a/.install/templates/keyboard-default.conf b/.install/templates/keyboard-default.conf index e81cb8a..0a346ab 100644 --- a/.install/templates/keyboard-default.conf +++ b/.install/templates/keyboard-default.conf @@ -4,7 +4,7 @@ # ----------------------------------------------------- input { kb_layout = KEYBOARD_LAYOUT - kb_variant = + kb_variant = KEYBOARD_VARIANT kb_model = kb_options = numlock_by_default = true diff --git a/.install/templates/keyboard-laptop.conf b/.install/templates/keyboard-laptop.conf index dab88f6..e7cab35 100644 --- a/.install/templates/keyboard-laptop.conf +++ b/.install/templates/keyboard-laptop.conf @@ -4,7 +4,7 @@ # ----------------------------------------------------- input { kb_layout = KEYBOARD_LAYOUT - kb_variant = + kb_variant = KEYBOARD_VARIANT kb_model = kb_options = numlock_by_default = true diff --git a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage index 0a8ef41..535b879 100755 Binary files a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage and b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage differ