Merge pull request #292 from vailrahmatulin/main

Keyboard layout change fix and correction. Change of keybinds as well and now moved to UserConfigs directory

3 files changed, 37 insertions, 3 deletions

diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index eede1669..9858558f 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -27,6 +27,7 @@ bind = $mainMod, Z, exec, pypr zoom # Toggle Zoom
 
 # User Added Keybinds
 bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
+bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Changing the keyboard layout
 
 # For passthrough keyboard into a VM
 # bind = $mainMod ALT, P, submap, passthru
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index f8c8c2a2..38c83f2c 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -93,7 +93,7 @@ input {
   kb_layout=us
   kb_variant=
   kb_model=
-  kb_options=grp:alt_shift_toggle
+  kb_options=
   kb_rules=
   repeat_rate=50
   repeat_delay=300
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index 0145e262..cbacd74f 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -41,5 +41,38 @@ new_layout="${layout_mapping[next_index]}"
 hyprctl switchxkblayout "at-translated-set-2-keyboard" "$new_layout"
 echo "$new_layout" > "$layout_f"
 
-# Notification for the new keyboard layout
-notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
+# Created by T-Crypt
+
+get_keyboard_names() {
+    hyprctl devices -j | jq -r '.keyboards[].name'
+}
+
+change_layout() {
+    local got_error=false
+
+    while read -r name; do
+        hyprctl switchxkblayout "$name" next
+        if [[ $? -eq 0 ]]; then
+            echo "Switched the layout for $name."
+        else
+            >&2 echo "Error while switching the layout for $name."
+            got_error=true
+        fi
+    done <<< "$(get_keyboard_names)"
+
+    if [ "$got_error" = true ]; then
+        >&2 echo "Some errors were found during the process..."
+        return 1
+    fi
+
+    return 0 # All layouts had been cycled successfully
+}
+
+if ! change_layout; then
+    notify-send -u low -t 2000 'Keyboard layout' 'Error: Layout change failed'
+    >&2 echo "Layout change failed."
+    exit 1
+else
+    # Notification for the new keyboard layout
+	  notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
+fi