From 7dcb9d06d0ff8ffae624863c141df213d0c8662e Mon Sep 17 00:00:00 2001
From: rootiest <chris@rootiest.com>
Date: Fri, 23 Aug 2024 09:46:17 -0400
Subject: [PATCH] fix: correct key binding ordering for pane movement

---
 config/keys.lua | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/config/keys.lua b/config/keys.lua
index de047ae..9065685 100644
--- a/config/keys.lua
+++ b/config/keys.lua
@@ -2,36 +2,47 @@
 --          │                          KEYS                           │
 --          ╰─────────────────────────────────────────────────────────╯
 
--- Define action table
+-- Define action class
 local act = WEZTERM.action
 
 return {
+	-- Leader key
 	leader = { key = " ", mods = "CTRL", timeout_milliseconds = 1500 },
+
 	keys = {
-		{ key = "a", mods = "LEADER|CTRL", action = WEZTERM.action.SendKey({ key = "a", mods = "CTRL" }) },
-		{ key = "|", mods = "LEADER|SHIFT", action = WEZTERM.action.SplitHorizontal({ domain = "CurrentPaneDomain" }) },
-		{ key = "_", mods = "LEADER|SHIFT", action = WEZTERM.action.SplitVertical({ domain = "CurrentPaneDomain" }) },
+		-- Split pane
+		{ key = "|", mods = "LEADER|SHIFT", action = act.SplitHorizontal({ domain = "CurrentPaneDomain" }) },
+		{ key = "_", mods = "LEADER|SHIFT", action = act.SplitVertical({ domain = "CurrentPaneDomain" }) },
+
+		-- Move pane
 		{ key = "h", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Left") },
-		{ key = "l", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Right") },
-		{ key = "k", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Up") },
 		{ key = "j", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Down") },
+		{ key = "k", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Up") },
+		{ key = "l", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Right") },
+
+		-- Resize pane
 		{ key = "h", mods = "ALT", action = act.AdjustPaneSize({ "Left", 1 }) },
-		{ key = "l", mods = "ALT", action = act.AdjustPaneSize({ "Right", 1 }) },
-		{ key = "k", mods = "ALT", action = act.AdjustPaneSize({ "Up", 1 }) },
 		{ key = "j", mods = "ALT", action = act.AdjustPaneSize({ "Down", 1 }) },
-		{
+		{ key = "k", mods = "ALT", action = act.AdjustPaneSize({ "Up", 1 }) },
+		{ key = "l", mods = "ALT", action = act.AdjustPaneSize({ "Right", 1 }) },
+
+		-- Miscellaneous
+		{ key = "a", mods = "LEADER|CTRL", action = act.SendKey({ key = "a", mods = "CTRL" }) },
+		{ key = "F1", mods = "LEADER", action = act.ShowDebugOverlay },
+
+		{ -- [S]ave Session
 			key = "s",
 			mods = "ALT",
-			action = WEZTERM.action.Multiple({
+			action = act.Multiple({
 				WEZTERM.action_callback(function(_, _)
 					RESURRECT.save_state(RESURRECT.workspace_state.get_workspace_state())
 				end),
 			}),
 		},
-		{
+		{ -- [R]estore Session
 			key = "r",
 			mods = "ALT",
-			action = WEZTERM.action.Multiple({
+			action = act.Multiple({
 				WEZTERM.action_callback(function(win, pane)
 					RESURRECT.fuzzy_load(win, pane, function(id, _)
 						id = string.match(id, "([^/]+)$")
@@ -46,5 +57,12 @@ return {
 				end),
 			}),
 		},
+		{
+			key = "!",
+			mods = "LEADER | SHIFT",
+			action = WEZTERM.action_callback(function(win, pane)
+				local tab, window = pane:move_to_new_window()
+			end),
+		},
 	},
 }