From 6e85922f2a366367edf886194eb453c4797cce52 Mon Sep 17 00:00:00 2001
From: Prad Nukala <prad@sonr.io>
Date: Thu, 11 Jun 2026 10:55:58 -0400
Subject: [PATCH] refactor(plugins): replace kitty-navigator with
 vim-tmux-navigator

---
 lua/plugins/claudecode.lua |  6 ++--
 lua/plugins/kitty.lua      | 56 +++++++++++---------------------------
 lua/plugins/neovim.lua     | 14 ----------
 3 files changed, 19 insertions(+), 57 deletions(-)
 delete mode 100644 lua/plugins/neovim.lua

diff --git a/lua/plugins/claudecode.lua b/lua/plugins/claudecode.lua
index 22313e3..db4edf3 100644
--- a/lua/plugins/claudecode.lua
+++ b/lua/plugins/claudecode.lua
@@ -36,9 +36,9 @@ return {
       ---@module "snacks"
       ---@type snacks.win.Config|{}
       snacks_win_opts = {
-        position = "float",
-        width = 0.95,
-        height = 0.95,
+        position = "right",
+        width = 0.3,
+        height = 1,
         border = "rounded",
         backdrop = 60,
         keys = {
diff --git a/lua/plugins/kitty.lua b/lua/plugins/kitty.lua
index 443b39d..11c99cd 100644
--- a/lua/plugins/kitty.lua
+++ b/lua/plugins/kitty.lua
@@ -1,42 +1,18 @@
-local function t_nav(fn)
-    return function()
-        vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes([[<C-\><C-n>]], true, false, true), "n", false)
-        vim.schedule(fn)
-    end
-end
-
 return {
-    "MunsMan/kitty-navigator.nvim",
-    -- Keep the kitty-side kittens in sync with the plugin. ~/.config/kitty is symlinked into the
-    -- dotfiles repo, so this copies navigate_kitty.py + pass_keys.py straight into the tracked config.
-    -- navigate_kitty.py is required for the nvim->kitty edge handoff (init.lua calls `kitty @ kitten
-    -- navigate_kitty.py <dir>`); pass_keys.py must match the `neighboring_window` map syntax in kitty.conf.
-    build = {
-        "cp navigate_kitty.py ~/.config/kitty",
-        "cp pass_keys.py ~/.config/kitty",
-    },
-    -- Disable smart-splits navigation keys (AstroNvim injects these when KITTY_LISTEN_ON is set);
-    -- kitty-navigator owns <C-h/j/k/l>. Resize bindings (<C-Up/Down/Left/Right>) are left intact.
-    specs = {
-        {
-            "AstroNvim/astrocore",
-            opts = function(_, opts)
-                local m = opts.mappings.n
-                m["<C-H>"] = false
-                m["<C-J>"] = false
-                m["<C-K>"] = false
-                m["<C-L>"] = false
-            end,
-        },
-    },
-    keys = {
-        {"<C-h>", function()require("kitty-navigator").navigateLeft()end,  desc = "Move left a Split",  mode = {"n"}},
-        {"<C-j>", function()require("kitty-navigator").navigateDown()end,  desc = "Move down a Split",  mode = {"n"}},
-        {"<C-k>", function()require("kitty-navigator").navigateUp()end,    desc = "Move up a Split",    mode = {"n"}},
-        {"<C-l>", function()require("kitty-navigator").navigateRight()end, desc = "Move right a Split", mode = {"n"}},
-        {"<C-h>", t_nav(function()require("kitty-navigator").navigateLeft()end),  desc = "Move left a Split",  mode = {"t"}},
-        {"<C-j>", t_nav(function()require("kitty-navigator").navigateDown()end),  desc = "Move down a Split",  mode = {"t"}},
-        {"<C-k>", t_nav(function()require("kitty-navigator").navigateUp()end),    desc = "Move up a Split",    mode = {"t"}},
-        {"<C-l>", t_nav(function()require("kitty-navigator").navigateRight()end), desc = "Move right a Split", mode = {"t"}},
-    },
+  "christoomey/vim-tmux-navigator",
+  cmd = {
+    "TmuxNavigateLeft",
+    "TmuxNavigateDown",
+    "TmuxNavigateUp",
+    "TmuxNavigateRight",
+    "TmuxNavigatePrevious",
+    "TmuxNavigatorProcessList",
+  },
+  keys = {
+    { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
+    { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
+    { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
+    { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
+    { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
+  },
 }
diff --git a/lua/plugins/neovim.lua b/lua/plugins/neovim.lua
deleted file mode 100644
index a3dadcc..0000000
--- a/lua/plugins/neovim.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- neovim.lua — auto-generated by iNiR. Use 99-inir-user.lua for overrides.
-return {
-  {
-    "yukazakiri/inir.nvim",
-    priority = 1000,
-    opts = {},
-  },
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "inir",
-    },
-  },
-}