From faf3b36275fe670e2c7ed84e33310abed9f45a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Jane=C5=BEi=C4=8D?= <janezic.mj@gmail.com>
Date: Thu, 18 May 2023 11:48:52 +0200
Subject: [PATCH] chore: decouple navbuddy from lsp

---
 lua/keymaps.lua          |  4 ----
 lua/plugins/lsp.lua      | 13 +------------
 lua/plugins/navbuddy.lua | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 lua/plugins/navbuddy.lua

diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index be91e0d..cbea536 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -37,10 +37,6 @@ vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
 vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
 vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
 
--- Plugins
-vim.keymap.set('n', '<leader>nb', ':Navbuddy<CR>', { desc = '[N]av[b]uddy' })
-vim.keymap.set('n', '<leader>nt', ':NvimTreeToggle<CR>', { desc = '[N]vim[T]ree' })
-
 -- terminal keymaps
 function _G.set_terminal_keymaps()
   local opts = { buffer = 0 }
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 73ccaa5..c2c4465 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -1,4 +1,4 @@
-local on_attach = function(client, bufnr)
+local on_attach = function(_, bufnr)
   local nmap = function(keys, func, desc)
     if desc then
       desc = 'LSP: ' .. desc
@@ -10,8 +10,6 @@ local on_attach = function(client, bufnr)
     vim.lsp.buf.format { timeout_ms = 2000 }
   end
 
-  require('nvim-navbuddy').attach(client, bufnr)
-
   nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
   nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
   nmap('<leader>ff', delayed_format, '[F]ormat')
@@ -50,15 +48,6 @@ return {
       'williamboman/mason.nvim',
       'williamboman/mason-lspconfig.nvim',
 
-      {
-        'SmiteshP/nvim-navbuddy',
-        dependencies = {
-          'neovim/nvim-lspconfig',
-          'SmiteshP/nvim-navic',
-          'MunifTanjim/nui.nvim',
-        },
-      },
-
       -- adds extra functionality over rust_analyzer
       'simrat39/rust-tools.nvim',
 
diff --git a/lua/plugins/navbuddy.lua b/lua/plugins/navbuddy.lua
new file mode 100644
index 0000000..9f089f9
--- /dev/null
+++ b/lua/plugins/navbuddy.lua
@@ -0,0 +1,15 @@
+return {
+  'SmiteshP/nvim-navbuddy',
+  dependencies = {
+    'neovim/nvim-lspconfig',
+    'SmiteshP/nvim-navic',
+    'MunifTanjim/nui.nvim',
+  },
+  config = function()
+    require('nvim-navbuddy').setup { lsp = { auto_attach = true } }
+
+    -- Plugins
+    vim.keymap.set('n', '<leader>nb', ':Navbuddy<CR>', { desc = '[N]av[b]uddy' })
+    vim.keymap.set('n', '<leader>nt', ':NvimTreeToggle<CR>', { desc = '[N]vim[T]ree' })
+  end,
+}