From 5e4274bb8276e5ba9d44d0361ca959c4f56895e5 Mon Sep 17 00:00:00 2001
From: Nick Burt <nbur4556@gmail.com>
Date: Wed, 1 Jul 2026 12:49:04 -0500
Subject: [PATCH] configure vimtmuxnavigator with vim pack

---
 doc/smoketest.md                        | 2 ++
 lua/custom/plugins/mini.lua             | 1 +
 lua/custom/plugins/oil.lua              | 8 --------
 lua/custom/plugins/vimtmuxnavigator.lua | 4 +---
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/doc/smoketest.md b/doc/smoketest.md
index 8c7bc571..f5b281e3 100644
--- a/doc/smoketest.md
+++ b/doc/smoketest.md
@@ -7,6 +7,8 @@ A manual smoketest checklist to ensure features are working:
 ### Custom
 - [ ] Oil
     - Shortcut `<leader>-` should open Oil
+- [ ] VimTmuxNavigator
+    - Should be able to navigate between nvim and tmux panes using `<CTRL>j`, `<CTRL>k`, `<CTRL>h`, `<CTRL>l` for each respective direction
 
 ### Themes
 - [ ] Catppuccin Theme
diff --git a/lua/custom/plugins/mini.lua b/lua/custom/plugins/mini.lua
index bea310ba..11a72641 100644
--- a/lua/custom/plugins/mini.lua
+++ b/lua/custom/plugins/mini.lua
@@ -1,3 +1,4 @@
+--FIX: fix/postmerge-20260701: make sure this configuration applies to upstreams version of mini
 return {
   'nvim-mini/mini.nvim',
   config = function()
diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua
index d1ce8092..016895d2 100644
--- a/lua/custom/plugins/oil.lua
+++ b/lua/custom/plugins/oil.lua
@@ -1,11 +1,3 @@
--- return {
---   'stevearc/oil.nvim',
---   config = function()
---     require('oil').setup()
---     vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' })
---   end,
--- }
-
 vim.pack.add { 'https://github.com/stevearc/oil.nvim' }
 require('oil').setup {
   vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' }),
diff --git a/lua/custom/plugins/vimtmuxnavigator.lua b/lua/custom/plugins/vimtmuxnavigator.lua
index d4aaccb2..c4e21b1b 100644
--- a/lua/custom/plugins/vimtmuxnavigator.lua
+++ b/lua/custom/plugins/vimtmuxnavigator.lua
@@ -1,3 +1 @@
-return {
-  'christoomey/vim-tmux-navigator',
-}
+vim.pack.add { 'https://github.com/christoomey/vim-tmux-navigator' }