Merge pull request #177 from JaKooLit/development

Development to main

1 files changed, 36 insertions, 34 deletions

diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 96ce9513..5b8e5fd4 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -25,10 +25,10 @@ bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, r
 bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji
 bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings 
 bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF
-bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout
 bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
 bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
 bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel
+bind = SHIFT, ALT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout
 
 # FEATURES / EXTRAS (UserScripts)
 bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings
@@ -106,43 +106,45 @@ bind = $mainMod SHIFT, tab, workspace, m-1
 bind = $mainMod SHIFT, U, movetoworkspace, special
 bind = $mainMod, U, togglespecialworkspace,
 
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
+# The following mappings use the key codes to better support various keyboard layouts
+# 1 is code:10, 2 is code 11, etc
+# Switch workspaces with mainMod + [0-9] 
+bind = $mainMod, code:10, workspace, 1
+bind = $mainMod, code:11, workspace, 2
+bind = $mainMod, code:12, workspace, 3
+bind = $mainMod, code:13, workspace, 4
+bind = $mainMod, code:14, workspace, 5
+bind = $mainMod, code:15, workspace, 6
+bind = $mainMod, code:16, workspace, 7
+bind = $mainMod, code:17, workspace, 8
+bind = $mainMod, code:18, workspace, 9
+bind = $mainMod, code:19, workspace, 10
 
-# Move active window and follow to workspace
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
+# Move active window and follow to workspace mainMod + SHIFT [0-9]
+bind = $mainMod SHIFT, code:10, movetoworkspace, 1
+bind = $mainMod SHIFT, code:11, movetoworkspace, 2
+bind = $mainMod SHIFT, code:12, movetoworkspace, 3
+bind = $mainMod SHIFT, code:13, movetoworkspace, 4
+bind = $mainMod SHIFT, code:14, movetoworkspace, 5
+bind = $mainMod SHIFT, code:15, movetoworkspace, 6
+bind = $mainMod SHIFT, code:16, movetoworkspace, 7
+bind = $mainMod SHIFT, code:17, movetoworkspace, 8
+bind = $mainMod SHIFT, code:18, movetoworkspace, 9
+bind = $mainMod SHIFT, code:19, movetoworkspace, 10
 bind = $mainMod SHIFT, bracketleft, movetoworkspace, -1 # brackets [ or ]
 bind = $mainMod SHIFT, bracketright, movetoworkspace, +1
 
-# Move active window to a workspace silently
-bind = $mainMod CTRL, 1, movetoworkspacesilent, 1
-bind = $mainMod CTRL, 2, movetoworkspacesilent, 2
-bind = $mainMod CTRL, 3, movetoworkspacesilent, 3
-bind = $mainMod CTRL, 4, movetoworkspacesilent, 4
-bind = $mainMod CTRL, 5, movetoworkspacesilent, 5
-bind = $mainMod CTRL, 6, movetoworkspacesilent, 6
-bind = $mainMod CTRL, 7, movetoworkspacesilent, 7
-bind = $mainMod CTRL, 8, movetoworkspacesilent, 8
-bind = $mainMod CTRL, 9, movetoworkspacesilent, 9
-bind = $mainMod CTRL, 0, movetoworkspacesilent, 10
+# Move active window to a workspace silently mainMod + CTRL [0-9]
+bind = $mainMod CTRL, code:10, movetoworkspacesilent, 1
+bind = $mainMod CTRL, code:11, movetoworkspacesilent, 2
+bind = $mainMod CTRL, code:12, movetoworkspacesilent, 3
+bind = $mainMod CTRL, code:13, movetoworkspacesilent, 4
+bind = $mainMod CTRL, code:14, movetoworkspacesilent, 5
+bind = $mainMod CTRL, code:15, movetoworkspacesilent, 6
+bind = $mainMod CTRL, code:16, movetoworkspacesilent, 7
+bind = $mainMod CTRL, code:17, movetoworkspacesilent, 8
+bind = $mainMod CTRL, code:18, movetoworkspacesilent, 9
+bind = $mainMod CTRL, code:19, movetoworkspacesilent, 10
 bind = $mainMod CTRL, bracketleft, movetoworkspacesilent, -1 # brackets [ or ]
 bind = $mainMod CTRL, bracketright, movetoworkspacesilent, +1