From 6881b5dfb910fd3d2b547e5cd6d1c0feb8318e31 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <e.litherlandsmith@icloud.com>
Date: Thu, 9 Feb 2023 22:09:51 +0000
Subject: [PATCH] Switch back to using Navigator plugin, got working with TMUX
 now

---
 Makefile                    | 10 ++++++++--
 config/nvim/lua/keymaps.lua |  7 +++++++
 config/nvim/lua/plugins.lua |  9 ++++++++-
 config/tmux/tmux.conf       |  3 +--
 pkglist.txt                 |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ce91e9f2..9ebc5c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,9 @@ POWERLEVEL_DIR := $(ZSH_CUSTOM_DIR)/themes/powerlevel10k
 TPM_REPO := https://github.com/tmux-plugins/tpm
 TPM_DIR := $(HOME)/.tmux/plugins/tpm
 
-.PHONY: install nopackages clean home packages config zsh ssh nvim
+.PHONY: install nopackages clean home packages config zsh ssh nvim tmux sort
 
-install: home packages config zsh ssh nvim
+install: home packages config zsh ssh nvim tmux
 
 nopackages: home config zsh ssh nvim
 
@@ -47,6 +47,12 @@ ssh: $(SSH_TARGETS) $(HOME)/.ssh/sockets
 
 nvim: $(PACKER_DIR)
 
+tmux:
+	python3 -m pip install --user libtmux==0.16.1
+
+sort:
+	sort -h pkglist.txt -o pkglist.txt
+
 $(HOME_TARGETS): $(HOME)/.%: home/%
 $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
 $(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: ohmyzsh/%.zsh
diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
index bc6ed968..a1354787 100644
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -30,3 +30,10 @@ vim.keymap.set('n', '<leader>xw', '<cmd>TroubleToggle workspace_diagnostics<cr>'
 vim.keymap.set('n', '<leader>xd', '<cmd>TroubleToggle document_diagnostics<cr>')
 vim.keymap.set('n', '<leader>xq', '<cmd>TroubleToggle quickfix<cr>')
 vim.keymap.set('n', '<leader>xl', '<cmd>TroubleToggle loclist<cr>')
+
+-- Navigator
+vim.keymap.set({'n', 't'}, '<A-h>', '<CMD>NavigatorLeft<CR>')
+vim.keymap.set({'n', 't'}, '<A-l>', '<CMD>NavigatorRight<CR>')
+vim.keymap.set({'n', 't'}, '<A-k>', '<CMD>NavigatorUp<CR>')
+vim.keymap.set({'n', 't'}, '<A-j>', '<CMD>NavigatorDown<CR>')
+vim.keymap.set({'n', 't'}, '<A-p>', '<CMD>NavigatorPrevious<CR>')
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 703048fa..3501423e 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -155,7 +155,14 @@ require('packer').startup {
                 }
             end
         }
-        use 'sunaku/tmux-navigate'
+        use {
+            'numToStr/Navigator.nvim',
+            config = function()
+                require('Navigator').setup {
+                    mux = 'auto'
+                }
+            end
+        }
     end,
     config = {
         display = {
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 1963801d..8941aab2 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -8,10 +8,9 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'ofirgall/tmux-window-name'
 set -g @plugin 'noscript/tmux-mighty-scroll'
 set -g @plugin 'jabirali/tmux-tilish'
-set -g @plugin 'sunaku/tmux-navigate'
 
 # Plugin options.
-set -g @tilish-navigate 'on'
+set -g @tilish-navigator 'on'
 set -g @tilish-dmenu 'on'
 set -g @tmux_window_name_use_tilde "True"
 
diff --git a/pkglist.txt b/pkglist.txt
index bd276b30..1699548e 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -6,7 +6,6 @@ pyenv
 python
 python-black
 python-isort
-python-libtmux
 python-pip
 python-pipx
 python-poetry
@@ -14,6 +13,7 @@ python-pre-commit
 python-pynvim
 python-virtualenv
 ripgrep
+tmux
 tree-sitter
 wezterm
 zsh