fix: pull window binding definition out of partial, into root config,…

… to prevent decl ordering issues
regolith-linux · Aug 7, 2024 · 1bdd1c4 · 1bdd1c4
1 parent c95971c
commit 1bdd1c4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/etc/regolith/i3/config b/etc/regolith/i3/config
@@ -135,6 +135,14 @@ set_from_resource $wm.binding.right wm.binding.right l
 set_from_resource $wm.binding.up wm.binding.up k
 set_from_resource $wm.binding.down wm.binding.down j
 
+###############################################################################
+# Common Window Bindings
+###############################################################################
+set_from_resource $wm.binding.move_left wm.binding.move_left Shift+h
+set_from_resource $wm.binding.move_right wm.binding.move_right Shift+l
+set_from_resource $wm.binding.move_up wm.binding.move_up Shift+k
+set_from_resource $wm.binding.move_down wm.binding.move_down Shift+j
+
 ###############################################################################
 # WM Config Partials
 ###############################################################################

diff --git a/etc/regolith/sway/config b/etc/regolith/sway/config
@@ -155,6 +155,14 @@ set_from_resource $wm.binding.right wm.binding.right l
 set_from_resource $wm.binding.up wm.binding.up k
 set_from_resource $wm.binding.down wm.binding.down j
 
+###############################################################################
+# Common Window Bindings
+###############################################################################
+set_from_resource $wm.binding.move_left wm.binding.move_left Shift+h
+set_from_resource $wm.binding.move_right wm.binding.move_right Shift+l
+set_from_resource $wm.binding.move_up wm.binding.move_up Shift+k
+set_from_resource $wm.binding.move_down wm.binding.move_down Shift+j
+
 ###############################################################################
 # WM Config Partials
 ###############################################################################

diff --git a/usr/share/regolith/common/config.d/40_workspace-config b/usr/share/regolith/common/config.d/40_workspace-config
@@ -9,10 +9,6 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 ## Modify // Window Position // <><Shift> k j h l ##
-set_from_resource $wm.binding.move_left wm.binding.move_left Shift+h
-set_from_resource $wm.binding.move_right wm.binding.move_right Shift+l
-set_from_resource $wm.binding.move_up wm.binding.move_up Shift+k
-set_from_resource $wm.binding.move_down wm.binding.move_down Shift+j
 bindsym $mod+$wm.binding.move_left move left
 bindsym $mod+$wm.binding.move_down move down
 bindsym $mod+$wm.binding.move_up move up