feat(neovim): lazy loaded and refactored a bunch

15 files changed, 124 insertions, 168 deletions

diff --git a/.config/nvim/lua/custom/configs/language-servers.lua b/.config/nvim/lua/custom/configs/language-servers.lua
index 4fd3fff..1165994 100644
--- a/.config/nvim/lua/custom/configs/language-servers.lua
+++ b/.config/nvim/lua/custom/configs/language-servers.lua
@@ -1,19 +1,20 @@
 -- NOTE: A list of language servers (and potentially their config)
 -- Accepts either true to enable, false to disable or a table with settings
 return {
-    lua_ls = {
-        settings = {
-            diagnostics = {
-                globals = { 'vim' },
-            },
-            workspace = {
-                library = {
-                    [vim.fn.expand('$VIMRUNTIME/lua')] = true,
-                    [vim.fn.stdpath('config') .. '/lua'] = true,
-                },
-            },
-        },
-    },                             -- lua
+    -- lua_ls = {
+    --     settings = {
+    --         diagnostics = {
+    --             globals = { 'vim' },
+    --         },
+    --         workspace = {
+    --             library = {
+    --                 [vim.fn.expand('$VIMRUNTIME/lua')] = true,
+    --                 [vim.fn.stdpath('config') .. '/lua'] = true,
+    --             },
+    --         },
+    --     },
+    -- },                             -- lua
+    lua_ls = true, -- lua
     clangd = true,                 -- C/C++
     gradle_ls = true,              -- java package manager
     jdtls = true,                  -- java eclipse lsp
diff --git a/.config/nvim/lua/custom/statusline.lua b/.config/nvim/lua/custom/configs/statusline.lua
index ce581c4..ce581c4 100644
--- a/.config/nvim/lua/custom/statusline.lua
+++ b/.config/nvim/lua/custom/configs/statusline.lua
diff --git a/.config/nvim/lua/custom/telescope.lua b/.config/nvim/lua/custom/configs/telescope.lua
index b554a33..b554a33 100644
--- a/.config/nvim/lua/custom/telescope.lua
+++ b/.config/nvim/lua/custom/configs/telescope.lua
diff --git a/.config/nvim/lua/custom/plugins/alpha.lua b/.config/nvim/lua/custom/plugins/alpha.lua
index 72af0a5..fa0740c 100644
--- a/.config/nvim/lua/custom/plugins/alpha.lua
+++ b/.config/nvim/lua/custom/plugins/alpha.lua
@@ -53,14 +53,16 @@ return {
         dashboard.section.buttons.opts.spacing = 0
         dashboard.section.buttons.val = {
             dashboard.button('e', '  > New file', '<cmd>ene <BAR> startinsert<cr>'),
-            dashboard.button('w', '  > Find file', '<cmd>cd ' .. find_file_path .. ' | Telescope find_files<cr>'),
+            dashboard.button('f', '  > Find file', '<cmd>cd ' .. find_file_path .. ' | Telescope find_files<cr>'),
             dashboard.button('r', '  > Recent', '<cmd>Telescope oldfiles<cr>'),
             dashboard.button('c', '  > Configuration', '<cmd>e $MYVIMRC<cr> | <cmd>cd %:p:h<cr>'),
-            dashboard.button(
-                's',
-                '󱎠  > Last Session',
-                '<cmd>lua require("auto-session.session-lens.actions").alternate_session()<cr>'
-            ),
+            -- FIX: doesn't seem to work so great, probably just use a project manager
+            -- will most likely make my own project manager plugin
+            -- dashboard.button(
+            --     's',
+            --     '󱎠  > Last Session',
+            --     '<cmd>lua require("auto-session.session-lens.actions").alternate_session()<cr>'
+            -- ),
             dashboard.button('q', '󰈆  > Quit NVIM', '<cmd>qa<cr>'),
         }
 
diff --git a/.config/nvim/lua/custom/plugins/colorschemes.lua b/.config/nvim/lua/custom/plugins/colorschemes.lua
index 8fa17af..e3dc5bd 100644
--- a/.config/nvim/lua/custom/plugins/colorschemes.lua
+++ b/.config/nvim/lua/custom/plugins/colorschemes.lua
@@ -8,19 +8,19 @@ return {
             require('colorschemes.dapui').set()
         end,
     },
-    'rktjmp/lush.nvim',
-    'catppuccin/nvim',
-    'marko-cerovac/material.nvim',
-    'rebelot/kanagawa.nvim',
-    'projekt0n/github-nvim-theme',
-    'EdenEast/nightfox.nvim',
-    'rose-pine/neovim',
-    'rafi/awesome-vim-colorschemes',
-    'datsfilipe/min-theme.nvim',
-    'nechaev/darkstorm.nvim',
-    'briones-gabriel/darcula-solid.nvim',
-    'okaihe/okai',
-    'uloco/bluloco.nvim',
-    'doums/darcula',
-    'pineapplegiant/spaceduck',
+    -- 'rktjmp/lush.nvim',
+    -- 'catppuccin/nvim',
+    -- 'marko-cerovac/material.nvim',
+    -- 'rebelot/kanagawa.nvim',
+    -- 'projekt0n/github-nvim-theme',
+    -- 'EdenEast/nightfox.nvim',
+    -- 'rose-pine/neovim',
+    -- 'rafi/awesome-vim-colorschemes',
+    -- 'datsfilipe/min-theme.nvim',
+    -- 'nechaev/darkstorm.nvim',
+    -- 'briones-gabriel/darcula-solid.nvim',
+    -- 'okaihe/okai',
+    -- 'uloco/bluloco.nvim',
+    -- 'doums/darcula',
+    -- 'pineapplegiant/spaceduck',
 }
diff --git a/.config/nvim/lua/custom/plugins/edgy.lua b/.config/nvim/lua/custom/plugins/edgy.lua
index 7f01245..872247f 100644
--- a/.config/nvim/lua/custom/plugins/edgy.lua
+++ b/.config/nvim/lua/custom/plugins/edgy.lua
@@ -23,15 +23,6 @@ return {
                 end,
                 size = { height = 0.5 },
             },
-            {
-                title = 'Neo-Tree Git',
-                ft = 'neo-tree',
-                filter = function(buf)
-                    return vim.b[buf].neo_tree_source == 'git_status'
-                end,
-                pinned = true,
-                open = 'Neotree position=right git_status',
-            },
         },
     },
 }
diff --git a/.config/nvim/lua/custom/plugins/motions.lua b/.config/nvim/lua/custom/plugins/motions.lua
deleted file mode 100644
index 9ab3fed..0000000
--- a/.config/nvim/lua/custom/plugins/motions.lua
+++ /dev/null
@@ -1,68 +0,0 @@
-return {
-    {
-        'christoomey/vim-tmux-navigator',
-        config = function()
-            vim.keymap.set('n', '<C-h>', '<cmd>TmuxNavigateLeft<cr>')
-            vim.keymap.set('n', '<C-j>', '<cmd>TmuxNavigateDown<cr>')
-            vim.keymap.set('n', '<C-k>', '<cmd>TmuxNavigateUp<cr>')
-            vim.keymap.set('n', '<C-l>', '<cmd>TmuxNavigateRight<cr>')
-        end,
-    },
-    {
-        'ggandor/leap.nvim',
-        dependencies = { 'tpope/vim-repeat' },
-        config = function()
-            -- vim.keymap.set({ 'n', 'x', 'o' }, 's', '<Plug>(leap-forward)')
-            -- vim.keymap.set({ 'n', 'x', 'o' }, 'S', '<Plug>(leap-backward)')
-            -- vim.keymap.set({ 'n', 'x', 'o' }, 'gs', '<Plug>(leap-from-window)')
-
-            vim.keymap.set('n', 's', '<Plug>(leap)')
-            vim.keymap.set('n', 'S', '<Plug>(leap-from-window)')
-            vim.keymap.set({ 'x', 'o' }, 's', '<Plug>(leap-forward)')
-            vim.keymap.set({ 'x', 'o' }, 'S', '<Plug>(leap-backward)')
-            vim.keymap.set({ 'n', 'o' }, 'gs', function()
-                require('leap.remote').action()
-            end)
-
-            -- Define equivalence classes for brackets and quotes, in addition to
-            -- the default whitespace group.
-            require('leap').opts.equivalence_classes = { ' \t\r\n', '([{', ')]}', '\'"`' }
-
-            -- Set background to gray in searchable area
-            vim.api.nvim_set_hl(0, 'LeapBackdrop', { fg = '#777777' })
-        end,
-    },
-    {
-        'windwp/nvim-autopairs',
-        event = 'InsertEnter',
-        config = true,
-    },
-    {
-        'numToStr/Comment.nvim',
-        opts = {
-            padding = true,
-            ignore = nil,
-
-            toggler = { line = 'gcc', block = 'gbc' },
-            opleader = { line = 'gc', block = 'gb' },
-            extra = { above = 'gcO', below = 'gco', eol = 'gcA' },
-
-            mappings = {
-                basic = true,  -- `gcc` `gbc` `gc[count]{motion}` `gb[count]{motion}`
-                extra = false, -- `gco`, `gcO`, `gcA`
-            },
-        },
-        config = function()
-            local api = require('Comment.api')
-            local esc = vim.api.nvim_replace_termcodes('<ESC>', true, false, true)
-            local toggole_linewise_selection = function()
-                vim.api.nvim_feedkeys(esc, 'nx', false)
-                api.toggle.linewise(vim.fn.visualmode())
-            end
-
-            -- <C-_> means Ctrl slash, `_` is a `/`
-            vim.keymap.set('n', '<C-_>', api.toggle.linewise.current, { noremap = true, silent = true })
-            vim.keymap.set('v', '<C-_>', toggole_linewise_selection, { noremap = true, silent = true })
-        end,
-    },
-}
diff --git a/.config/nvim/lua/custom/plugins/neotree.lua b/.config/nvim/lua/custom/plugins/neotree.lua
index 72f8b36..d008b69 100644
--- a/.config/nvim/lua/custom/plugins/neotree.lua
+++ b/.config/nvim/lua/custom/plugins/neotree.lua
@@ -9,6 +9,7 @@ return {
         'nvim-tree/nvim-web-devicons',
         'MunifTanjim/nui.nvim',
     },
+    cmd = 'Neotree',
     config = function()
         require('neo-tree').setup({
             open_files_do_not_replace_types = { 'terminal', 'Trouble', 'qf', 'edgy' },
diff --git a/.config/nvim/lua/custom/plugins/oil.lua b/.config/nvim/lua/custom/plugins/oil.lua
index 0c193a9..0d81fca 100644
--- a/.config/nvim/lua/custom/plugins/oil.lua
+++ b/.config/nvim/lua/custom/plugins/oil.lua
@@ -1,29 +1,34 @@
 return {
     'stevearc/oil.nvim',
     dependencies = { 'nvim-tree/nvim-web-devicons' },
-    config = function()
-        local oil = require('oil')
-        oil.setup({
-            default_file_explorer = true,
-            skip_confirm_for_simple_edits = true,
-            keymaps = {
-                ['gs'] = false,
-                ['<C-h>'] = false,
-                ['<C-l>'] = false,
-                ['<C-k>'] = false,
-                ['<C-j>'] = false,
-                ['<M-h>'] = 'actions.select_split',
-                ['<M-v>'] = 'actions.select_vsplit',
-                ['<C-r>'] = 'actions.refresh',
-                ['<C-q>'] = 'actions.close',
-                ['gS'] = 'actions.change_sort',
-            },
-            view_options = {
-                show_hidden = true,
-                natural_order = true,
-            },
-        })
-        vim.keymap.set('n', '<leader>ob', '<cmd>Oil<cr>', { desc = '[O]il [B]uffer' })
-        vim.keymap.set('n', '<leader>of', oil.toggle_float, { desc = '[O]il [F]loat' })
+    keys = {
+        { '<leader>ob', '<cmd>Oil<cr>',                             desc = '[O]il [B]uffer' },
+        { '<leader>of', '<cmd>lua require("oil").toggle_float<cr>', desc = '[O]il [F]loat' },
+    },
+    opts = {
+        default_file_explorer = true,
+        skip_confirm_for_simple_edits = true,
+        keymaps = {
+            ['gs'] = false,
+            ['<C-h>'] = false,
+            ['<C-l>'] = false,
+            ['<C-k>'] = false,
+            ['<C-j>'] = false,
+            ['<M-h>'] = 'actions.select_split',
+            ['<M-v>'] = 'actions.select_vsplit',
+            ['<C-r>'] = 'actions.refresh',
+            ['<C-q>'] = 'actions.close',
+            ['gS'] = 'actions.change_sort',
+        },
+        view_options = {
+            show_hidden = true,
+            natural_order = true,
+        },
+    },
+    cmd = 'Oil',
+    event = function()
+        if vim.fn.isdirectory(vim.fn.expand('%')) == 1 then
+            return 'VimEnter'
+        end
     end,
 }
diff --git a/.config/nvim/lua/custom/plugins/overseer.lua b/.config/nvim/lua/custom/plugins/overseer.lua
index f1015ba..38a9a85 100644
--- a/.config/nvim/lua/custom/plugins/overseer.lua
+++ b/.config/nvim/lua/custom/plugins/overseer.lua
@@ -1,25 +1,24 @@
 return {
     'stevearc/overseer.nvim',
-    opts = {},
-    config = function()
-        require('overseer').setup({
-            templates = { 'builtin', 'custom' },
-            task_list = {
-                min_height = 0.5,
-                bindings = {
-                    ['o'] = false,
-                    ['<C-v>'] = false,
-                    ['<C-s>'] = false,
-                    ['<C-h>'] = false,
-                    ['<C-j>'] = false,
-                    ['<C-k>'] = false,
-                    ['<C-l>'] = false,
-                    ['<C-u>'] = 'ScrollOutputUp',
-                    ['<C-d>'] = 'ScrollOutputDown',
-                },
+    opts = {
+        templates = { 'builtin', 'custom' },
+        task_list = {
+            min_height = 0.5,
+            bindings = {
+                ['o'] = false,
+                ['<C-v>'] = false,
+                ['<C-s>'] = false,
+                ['<C-h>'] = false,
+                ['<C-j>'] = false,
+                ['<C-k>'] = false,
+                ['<C-l>'] = false,
+                ['<C-u>'] = 'ScrollOutputUp',
+                ['<C-d>'] = 'ScrollOutputDown',
             },
-        })
-        vim.keymap.set('n', '<leader>or', '<cmd>OverseerRun<cr>', { desc = '[O]verseer [R]un' })
-        vim.keymap.set('n', '<leader>ot', '<cmd>OverseerToggle<cr>', { desc = '[O]verseer [T]oggle' })
-    end,
+        },
+    },
+    keys = {
+        { '<leader>or', '<cmd>OverseerRun<cr>',    desc = '[O]verseer [R]un' },
+        { '<leader>ot', '<cmd>OverseerToggle<cr>', desc = '[O]verseer [T]oggle' }
+    }
 }
diff --git a/.config/nvim/lua/custom/plugins/statusline.lua b/.config/nvim/lua/custom/plugins/statusline.lua
index 8c37eab..8dfe41f 100644
--- a/.config/nvim/lua/custom/plugins/statusline.lua
+++ b/.config/nvim/lua/custom/plugins/statusline.lua
@@ -1,8 +1,8 @@
 return {
     'nvim-lualine/lualine.nvim',
     dependencies = { 'nvim-tree/nvim-web-devicons', 'linrongbin16/lsp-progress.nvim' },
+    event = 'BufWinEnter',
     config = function()
-        require('custom.statusline')
+        require('custom.configs.statusline')
     end,
-    event = 'BufWinEnter',
 }
diff --git a/.config/nvim/lua/custom/plugins/telescope.lua b/.config/nvim/lua/custom/plugins/telescope.lua
index 1d8f49c..945dc2e 100644
--- a/.config/nvim/lua/custom/plugins/telescope.lua
+++ b/.config/nvim/lua/custom/plugins/telescope.lua
@@ -8,6 +8,15 @@ return {
     },
     cmd = 'Telescope',
     config = function()
-        require('custom.telescope')
+        require('custom.configs.telescope')
     end,
+    keys = {
+        '<leader>fs',
+        '<leader>fa',
+        '<leader>fh',
+        '<leader>fm',
+        '<leader>lv',
+        '<leader>f.',
+        '<leader>th',
+    },
 }
diff --git a/.config/nvim/lua/custom/plugins/treesitter.lua b/.config/nvim/lua/custom/plugins/treesitter.lua
index ec3136c..a5fba2d 100644
--- a/.config/nvim/lua/custom/plugins/treesitter.lua
+++ b/.config/nvim/lua/custom/plugins/treesitter.lua
@@ -1,6 +1,7 @@
 return {
     {
         'nvim-treesitter/nvim-treesitter',
+        lazy = true,
         build = ':TSUpdate',
         config = function()
             ---@type userdata
diff --git a/.config/nvim/lua/custom/plugins/ui.lua b/.config/nvim/lua/custom/plugins/ui.lua
deleted file mode 100644
index 97aeadd..0000000
--- a/.config/nvim/lua/custom/plugins/ui.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-return {
-}
diff --git a/.config/nvim/lua/custom/plugins/utility.lua b/.config/nvim/lua/custom/plugins/utility.lua
index 5deee38..66e88a8 100644
--- a/.config/nvim/lua/custom/plugins/utility.lua
+++ b/.config/nvim/lua/custom/plugins/utility.lua
@@ -25,9 +25,18 @@ return {
             require('auto-session').setup({
                 log_level = 'error',
                 auto_session_suppress_dirs = { '~/', '/' },
+                session_lens = { load_on_setup = false },
             })
-            local session = require('auto-session.session-lens')
-            vim.keymap.set('n', '<C-s>', session.search_session, { desc = '[S]ession Manager' })
+
+            local session_lens_setup_done = false
+            local function search_session()
+                if not session_lens_setup_done then
+                    require('auto-session').setup_session_lens()
+                    session_lens_setup_done = true
+                end
+                require('auto-session.session-lens').search_session()
+            end
+            vim.keymap.set('n', '<C-s>', search_session, { desc = '[S]ession Manager' })
         end,
     },
     { 'wakatime/vim-wakatime',  lazy = false },
@@ -144,11 +153,7 @@ return {
             vim.api.nvim_set_hl(0, 'LeapBackdrop', { fg = '#777777' })
         end,
     },
-    {
-        'windwp/nvim-autopairs',
-        event = 'InsertEnter',
-        config = true,
-    },
+    { 'windwp/nvim-autopairs', event = 'InsertEnter', config = true },
     {
         -- 'numToStr/Comment.nvim',
         'os-mey/Comment.nvim',
@@ -168,4 +173,16 @@ return {
             vim.keymap.set('v', '<C-_>', toggle_linewise_selection, { noremap = true, silent = true })
         end,
     },
+    {
+        'j-morano/buffer_manager.nvim',
+        dependencies = { 'nvim-lua/plenary.nvim' },
+        keys = {
+            {
+                '<leader>e',
+                function()
+                    require('buffer_manager.ui').toggle_quick_menu()
+                end,
+            },
+        },
+    },
 }