1 files changed, 24 insertions, 33 deletions

diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index e8630f2..f1fea73 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -198,11 +198,6 @@ require('packer').startup({function()
       })
     end} -- }}}
 
-  use {'ggandor/leap.nvim', -- {{{
-    config = function()
-      require('leap').set_default_keymaps()
-    end} -- }}}
-
   _G.treesitter_enabled = { -- {{{
     'bash',
     'bibtex',
@@ -344,16 +339,12 @@ require('packer').startup({function()
     end} -- }}}
 
   use {'neovim/nvim-lspconfig', -- {{{
-    require = {
-      'nvim-lua/lsp-status.nvim',
-      'stevearc/aerial.nvim',
-    },
     config = function()
       require('telescope').load_extension('lsp_handlers')
       require('internal.lsp').setup()
     end} -- }}}
 
-  use {'nvim-lua/lsp-status.nvim', -- {{{
+  use {'nvim-lua/lsp-status.nvim', module = {'lsp-status'}, -- {{{
     config = function()
       local lspstatus = require('lsp-status')
       lspstatus.config {
@@ -364,10 +355,9 @@ require('packer').startup({function()
       lspstatus.register_progress()
     end} -- }}}
 
-  use {'stevearc/aerial.nvim', -- {{{
+  use {'stevearc/aerial.nvim', disable = true, -- {{{
     config = function()
-      local aerial = require('aerial')
-      aerial.setup({
+      require('aerial').setup({
         backends = { 'lsp', 'treesitter', 'markdown' },
         filter_kind = {
           -- default:
@@ -384,18 +374,23 @@ require('packer').startup({function()
           'Variable',
         },
         icons = require('internal.lsp').symbols,
-        close_automatic_events = {'switch_buffer'},
+        close_automatic_events = { 'unsupported' },
+        placement = 'edge',
         open_automatic = function(bufnr)
-            return vim.api.nvim_buf_line_count(bufnr) > 80
-              and aerial.num_symbols(bufnr) > 4
-              and not aerial.was_closed()
+            return vim.api.nvim_buf_line_count(bufnr) > 200
+              and package.loaded.aerial.num_symbols(bufnr) > 4
+              and not package.loaded.aerial.was_closed()
         end,
         default_keybinds = false,
         show_guides = true,
       })
+      -- TODO: https://github.com/neovim/neovim/issues/18660
+      -- vim.api.nvim_create_autocmd('FileType', { pattern = 'aerial',
+      --   callback = function() vim.opt_local.winbar = '' end,
+      -- })
     end} --- }}}
 
-  use {'SmiteshP/nvim-navic', -- {{{
+  use {'SmiteshP/nvim-navic', module = 'nvim-navic', -- {{{
     requires = {'neovim/nvim-lspconfig'},
     config = function()
       local navic = require('nvim-navic')
@@ -405,19 +400,15 @@ require('packer').startup({function()
     end} -- }}}
 
   use {'kosayoda/nvim-lightbulb', -- {{{
-    -- branch = 'virtual-text-column',
     config = function()
       require('nvim-lightbulb').setup {
         ignore = {'null-ls'},
         sign         = { enabled = false },
         virtual_text = { enabled = false, text = '←  󰌵' },
-        status_text  = { enabled = true, text = '󰌵', text_unavailable = '' }
+        status_text  = { enabled = true, text = '󰌵', text_unavailable = '' },
+        autocmd      = { enabled = true },
       }
       vim.fn.sign_define({{name='LightBulbSign', text='󰌵', texthl='LightBulbSign'}})
-      vim.api.nvim_create_autocmd({'CursorHold', 'CursorHoldI'}, {
-        callback = require('nvim-lightbulb').update_lightbulb,
-        group = vim.api.nvim_create_augroup('LightBulbUpdate', {}),
-      })
     end} -- }}}
 
   use {'weilbith/nvim-code-action-menu', module = 'code_action_menu', -- {{{
@@ -726,13 +717,10 @@ require('packer').startup({function()
       }
 
       -- local extension
-      require('telescope').load_extension('jobs')
-
+      -- require('telescope').load_extension('jobs')
       -- required to get fzf-native working
       require('telescope').load_extension('fzf')
-      require('telescope').load_extension('lsp_handlers')
       require('telescope').load_extension('ui-select')
-      require('telescope').load_extension('zk')
 
       vim.keymap.set('n', ';Q', require('telescope.builtin').quickfix, {desc='quickfix'})
       vim.keymap.set('n', ';C', require('telescope.builtin').loclist, {desc='loclist'})
@@ -745,8 +733,6 @@ require('packer').startup({function()
       vim.keymap.set('n', ';l', require('telescope.builtin').current_buffer_fuzzy_find, {desc='buffer'})
       vim.keymap.set('n', ';o', require('telescope.builtin').oldfiles, {desc='oldfiles'})
       vim.keymap.set('n', ';d', require('telescope.builtin').diagnostics, {desc='diagnostics'})
-      -- vim.keymap.set('n', ';s', require('telescope.builtin').lsp_workspace_symbols, {desc='lsp workspace symbols'})
-      -- vim.keymap.set('n', ';r', require('telescope.builtin').lsp_references, {desc='lsp references'})
       vim.keymap.set('n', ';v', function()
           require('telescope.builtin').find_files({
             prompt_title = 'vimrc',
@@ -901,6 +887,8 @@ require('packer').startup({function()
   use {'mickael-menu/zk-nvim', module = {'zk', 'telescope._extensions.zk'}, -- {{{
     config = function()
       local lsp = require('internal.lsp')
+
+      require('telescope').load_extension('zk')
       require('zk').setup {
         picker = 'telescope',
         lsp = {
@@ -1243,14 +1231,17 @@ require('packer').startup({function()
       end
     end} -- }}}
 
-  use {'~/devel/projects/k2', rtp = 'nvim', -- {{{
+  use {'~/devel/projects/k2', rtp = 'nvim', module = {'k2'}, cmd = {'K2'}, -- {{{
     config = function()
       require('k2').setup()
     end} -- }}}
 
-  use {'~/devel/projects/spinner.nvim', -- {{{
+  use {'~/devel/projects/spinner.nvim', module = {'spinner'}, -- {{{
     config = function()
-      require('spinner').setup()
+      require('spinner').setup {
+        spinner = {'⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'},
+        interval = 120, -- spinner frame rate in ms
+      }
     end} -- }}}
 
 end,