Merge pull request #39 from regolith-linux/fix-bindings-decl-order

fix: pull nav binding definition out of partial, into root config, to…
regolith-linux · Jul 16, 2024 · bee2726 · bee2726
2 parents 314acbc + 770bfe7
commit bee2726
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
@@ -126,6 +126,14 @@ set_from_resource $wm.bar.workspace.urgent.text.color wm.bar.workspace.urgent.te
 set_from_resource $wm.font gtk.font_name Sans 13
 font pango:$wm.font
 
+###############################################################################
+# Common Navigation Bindings
+###############################################################################
+set_from_resource $wm.binding.left wm.binding.left h
+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
+
 ###############################################################################
 # WM Config Partials
 ###############################################################################

diff --git a/etc/regolith/sway/config b/etc/regolith/sway/config
@@ -146,6 +146,14 @@ set_from_resource $wm.bar.workspace.urgent.text.color wm.bar.workspace.urgent.te
 set_from_resource $wm.font gtk.font_name Sans 13
 font pango:$wm.font
 
+###############################################################################
+# Common Navigation Bindings
+###############################################################################
+set_from_resource $wm.binding.left wm.binding.left h
+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
+
 ###############################################################################
 # WM Config Partials
 ###############################################################################

diff --git a/usr/share/regolith/common/config.d/30_navigation b/usr/share/regolith/common/config.d/30_navigation
@@ -17,10 +17,6 @@ bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 ## Navigate // Relative Window // <> k j h l ##
-set_from_resource $wm.binding.left wm.binding.left h
-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
 bindsym $mod+$wm.binding.left focus left
 bindsym $mod+$wm.binding.down focus down
 bindsym $mod+$wm.binding.up focus up