feat: A working state during the transfer between the old neovim

configurations and using newer built-in functionality in the 0.12.x versions of Neovim. Further work is needed for treesitter updates, cleanup of the conversion work and testing to verify old functionality isn't lessened to get the benefits of a cleaner config and vastly faster load times.
2026-05-23 20:28:34 -05:00
parent deea09dac5
commit abe81c01b3
28 changed files with 490 additions and 609 deletions
--- a/nvim/lua/plugins/autopairs.lua
+++ b/nvim/lua/plugins/autopairs.lua
@@ -1,6 +0,0 @@
-return {
-    'windwp/nvim-autopairs',
-    config = function()
-        require('nvim-autopairs').setup()
-    end
-}
--- a/nvim/lua/plugins/comment.lua
+++ b/nvim/lua/plugins/comment.lua
@@ -1,16 +0,0 @@
-return {
-    'numToStr/Comment.nvim',
-    config = function()
-        require('Comment').setup {
-            ignore = '^$',
-            toggler = {
-                line = 'gc',
-                block = '<nop>',
-            },
-        }
-    end,
-    keys = {
-        { '<leader>c', ':norm gcc<CR>' },
-        { '<leader>c', ':norm gc<CR>', mode = 'v' },
-    }
-}
--- a/nvim/lua/plugins/floaterm.lua
+++ b/nvim/lua/plugins/floaterm.lua
@@ -1,8 +0,0 @@
-return {
-    'voldikss/vim-floaterm',
-    keys = {
-        { 't', ':FloatermToggle myfloat<CR>' },
-        { '<ESC>', '<C-\\><C-n>:q<CR>', mode = 't' },
-    },
-    lazy = false,
-}
--- a/nvim/lua/plugins/gitsigns.lua
+++ b/nvim/lua/plugins/gitsigns.lua
@@ -1,52 +1,52 @@
-return {
-    'lewis6991/gitsigns.nvim',
-    config = function()
-        require('gitsigns').setup {
-            on_attach = function(bufnr)
-                local gitsigns = require('gitsigns')
+vim.pack.add({
+    'https://github.com/lewis6991/gitsigns.nvim'
+})

-                local function map(mode, l, r, opts)
-                    opts = opts or {}
-                    opts.buffer = bufnr
-                    vim.keymap.set(mode, l, r, opts)
-                end
+require('gitsigns').setup {
+    on_attach = function(bufnr)
+        local gitsigns = require('gitsigns')

-                -- Navigation
-                map('n', ']c', function()
-                    if vim.wo.diff then
-                        vim.cmd.normal({ ']c', bang = true })
-                    else
-                        gitsigns.nav_hunk('next')
-                    end
-                end)
+        -- TODO: Move to custom functions?
+        local function map(mode, l, r, opts)
+            opts = opts or {}
+            opts.buffer = bufnr
+            vim.keymap.set(mode, l, r, opts)
+        end

-                map('n', '[c', function()
-                    if vim.wo.diff then
-                        vim.cmd.normal({ '[c', bang = true })
-                    else
-                        gitsigns.nav_hunk('prev')
-                    end
-                end)
-
-                -- Actions
-                map('n', '<leader>gs', gitsigns.stage_hunk)
-                map('n', '<leader>gu', gitsigns.undo_stage_hunk)
-                map('n', '<leader>gr', gitsigns.reset_hunk)
-                map('v', '<leader>gs', function() gitsigns.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
-                map('v', '<leader>gu', function() gitsigns.undo_stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
-                map('v', '<leader>gr', function() gitsigns.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
-                map('n', '<leader>gS', gitsigns.stage_buffer)
-                map('n', '<leader>gR', gitsigns.reset_buffer)
-                map('n', '<leader>gp', gitsigns.preview_hunk)
-                map('n', '<leader>gb', function() gitsigns.blame_line { full = true } end)
-                map('n', '<leader>gtb', gitsigns.toggle_current_line_blame)
-                map('n', '<leader>gd', gitsigns.diffthis)
-                map('n', '<leader>gD', function() gitsigns.diffthis('~') end)
-                map('n', '<leader>gtd', gitsigns.toggle_deleted)
-
-                -- Text object
-                map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+        -- Navigation
+        map('n', ']c', function()
+            if vim.wo.diff then
+                vim.cmd.normal({ ']c', bang = true })
+            else
+                gitsigns.nav_hunk('next')
            end
-        }
-    end,
+        end)
+
+        map('n', '[c', function()
+            if vim.wo.diff then
+                vim.cmd.normal({ '[c', bang = true })
+            else
+                gitsigns.nav_hunk('prev')
+            end
+        end)
+
+        -- Actions
+        map('n', '<leader>gs', gitsigns.stage_hunk)
+        map('n', '<leader>gu', gitsigns.undo_stage_hunk)
+        map('n', '<leader>gr', gitsigns.reset_hunk)
+        map('v', '<leader>gs', function() gitsigns.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
+        map('v', '<leader>gu', function() gitsigns.undo_stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
+        map('v', '<leader>gr', function() gitsigns.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
+        map('n', '<leader>gS', gitsigns.stage_buffer)
+        map('n', '<leader>gR', gitsigns.reset_buffer)
+        map('n', '<leader>gp', gitsigns.preview_hunk)
+        map('n', '<leader>gb', function() gitsigns.blame_line { full = true } end)
+        map('n', '<leader>gtb', gitsigns.toggle_current_line_blame)
+        map('n', '<leader>gd', gitsigns.diffthis)
+        map('n', '<leader>gD', function() gitsigns.diffthis('~') end)
+        map('n', '<leader>gtd', gitsigns.toggle_deleted)
+
+        -- Text object
+        map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+    end
 }
--- a/nvim/lua/plugins/gruvbox.lua
+++ b/nvim/lua/plugins/gruvbox.lua
@@ -1,10 +0,0 @@
-return {
-    'sainnhe/gruvbox-material',
-    config = function()
-        vim.g.gruvbox_material_enable_italic = true
-        vim.g.gruvbox_material_background = 'hard'
-        vim.cmd.colorscheme('gruvbox-material')
-    end,
-    lazy = false,
-    priority = 1000,
-}
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -1,39 +0,0 @@
-return {
-    'neovim/nvim-lspconfig',
-    config = function()
-        vim.diagnostic.config({
-            virtual_text = {
-                source = 'always',
-            },
-            severity_sort = true,
-            float = {
-                source = 'always'
-            }
-        })
-
-        -- Auto set keymaps and other settings on LSP attach
-        vim.api.nvim_create_autocmd('LspAttach', {
-            group = vim.api.nvim_create_augroup('my.lsp', {}),
-            callback = function(args)
-                local bufnr = args.buf
-
-                -- Keyboard Mappings
-                local bufopts = { noremap = true, silent = true, buffer = bufnr }
-                vim.keymap.set('n', '<C-[>', vim.diagnostic.goto_prev, bufopts)
-                vim.keymap.set('n', '<C-]>', vim.diagnostic.goto_next, bufopts)
-                vim.keymap.set('n', 'ga', vim.lsp.buf.code_action, bufopts)
-                vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
-                vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
-                vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
-                vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
-                vim.keymap.set('n', 'gs', vim.lsp.buf.signature_help, bufopts)
-                vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-                vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
-                vim.keymap.set('n', '<leader><leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
-                vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, bufopts)
-            end,
-        })
-
-        vim.lsp.enable('gdscript')
-    end
-}
--- a/nvim/lua/plugins/lualine.lua
+++ b/nvim/lua/plugins/lualine.lua
@@ -6,26 +6,23 @@ local function get_schema()
    return schema.result[1].name
 end

-return {
-    'nvim-lualine/lualine.nvim',
-    config = function()
-        require('lualine').setup {
-            tabline = {
-                lualine_a = {
-                    'tabs',
-                },
-                lualine_z = {
-                    'buffers',
-                }
-            },
-            sections = {
-                lualine_x = {
-                    'encoding', 'fileformat', 'filetype', get_schema
-                },
-            }
+vim.pack.add({
+    'https://github.com/nvim-tree/nvim-web-devicons',
+    'https://github.com/nvim-lualine/lualine.nvim'
+})
+
+require('lualine').setup {
+    tabline = {
+        lualine_a = {
+            'tabs',
+        },
+        lualine_z = {
+            'buffers',
        }
-    end,
-    dependencies = {
-        'nvim-tree/nvim-web-devicons'
    },
+    sections = {
+        lualine_x = {
+            'encoding', 'fileformat', 'filetype', get_schema
+        },
+    }
 }
--- a/nvim/lua/plugins/luasnip.lua
+++ b/nvim/lua/plugins/luasnip.lua
@@ -1,12 +1,20 @@
-return {
-    'L3MON4D3/LuaSnip',
-    config = function()
-        require('luasnip.loaders.from_vscode').lazy_load()
-        require('luasnip.loaders.from_lua').lazy_load({ paths = "./snippets" })
-    end,
-    dependencies = {
-        'saadparwaiz1/cmp_luasnip', -- Wrapper to load snippets in nvim-cmp
-        'rafamadriz/friendly-snippets',
-    },
-    build = "make install_jsregexp"
-}
+vim.pack.add({
+    'https://github.com/saadparwaiz1/cmp_luasnip',
+    'https://github.com/rafamadriz/friendly-snippets',
+    'https://github.com/L3MON4D3/LuaSnip'
+})
+
+local luasnip_lua_path = vim.api.nvim_get_runtime_file('lua/luasnip/init.lua', false)[1]
+if not luasnip_lua_path then return end
+local luasnip_root = vim.fn.fnamemodify(luasnip_lua_path, ':h:h:h')
+
+vim.api.nvim_create_autocmd('PackChanged', { callback = function(args)
+    local name, kind = args.data.spec.name, args.data.kind
+    if name == 'luasnip' and kind == 'update' then
+        if not args.data.active then vim.cmd.packadd('luasnip') end
+        vim.system({'make', 'install_jsregexp'}, { cwd = luasnip_root })
+    end
+end})
+
+require('luasnip.loaders.from_vscode').lazy_load()
+require('luasnip.loaders.from_lua').lazy_load({ paths = "./snippets" })
--- a/nvim/lua/plugins/markdown-preview.lua
+++ b/nvim/lua/plugins/markdown-preview.lua
@@ -1,15 +0,0 @@
-return {
-    'iamcco/markdown-preview.nvim',
-    cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' },
-    ft = { 'markdown' },
-    build = function()
-        vim.fn['mkdp#util#install']()
-    end,
-    keys = {
-        {
-            '<leader>md',
-            ':MarkdownPreviewToggle<CR>',
-            desc = 'Toggles Markdown preview service'
-        }
-    },
-}
--- a/nvim/lua/plugins/mason.lua
+++ b/nvim/lua/plugins/mason.lua
@@ -1,27 +1,22 @@
-return {
-    'mason-org/mason.nvim',
-    config = function()
-        require('mason').setup()
+vim.pack.add({
+    'https://github.com/mason-org/mason.nvim',
+    'https://github.com/mason-org/mason-lspconfig.nvim',
+})

-        require('mason-lspconfig').setup {
-            automatic_enable = true,
-            ensure_installed = {
-                'ansiblels',               -- Ansible
-                'arduino_language_server', -- Arduino specific C
-                'bashls',                  -- Bash
-                'clangd',                  -- C/C++
-                'intelephense',            -- PHP
-                'lua_ls',                  -- Lua
-                'marksman',                -- markdown
-                'pylsp',                   -- Python
-                'rust_analyzer',           -- Rust
-                'ts_ls',                   -- Typscript
-                'yamlls',                  -- YAML
-            }
-        }
-    end,
-    dependencies = {
-        'mason-org/mason-lspconfig.nvim',
-    },
-    lazy = false,
+require('mason').setup()
+require('mason-lspconfig').setup {
+    automatic_enable = true,
+    ensure_installed = {
+        'ansiblels',               -- Ansible
+        'arduino_language_server', -- Arduino specific C
+        'bashls',                  -- Bash
+        'clangd',                  -- C/C++
+        'intelephense',            -- PHP
+        'lua_ls',                  -- Lua
+        'marksman',                -- markdown
+        'pylsp',                   -- Python
+        'rust_analyzer',           -- Rust
+        'ts_ls',                   -- Typscript
+        'yamlls',                  -- YAML
+    }
 }
--- a/nvim/lua/plugins/nvim-cmp.lua
+++ b/nvim/lua/plugins/nvim-cmp.lua
@@ -1,70 +1,66 @@
-return {
-    'hrsh7th/nvim-cmp',
-    config = function()
-        local cmp = require('cmp')
-        cmp.setup {
-            completion = {
-                completeopt = 'menu,menuone,noinsert',
-            },
-            experimental = {
-                ghost_text = true,
-            },
-            mapping = {
-                ['<C-n>'] = cmp.mapping.select_next_item(),
-                ['<C-p>'] = cmp.mapping.select_prev_item(),
-                ['<C-j>'] = cmp.mapping.scroll_docs(-4),
-                ['<C-k>'] = cmp.mapping.scroll_docs(4),
-                ['<C-space>'] = cmp.mapping.complete(),
-                ['<C-y>'] = cmp.mapping.confirm({
-                    behavior = cmp.ConfirmBehavior.Insert,
-                    select = true,
-                }),
-            },
-            formatting = {
-                format = function(entry, vim_item)
-                    vim_item.menu = ({
-                        buffer = '[Buf]',
-                        luasnip = '[Snips]',
-                        nvim_lsp = '[LSP]',
-                        nvim_lua = '[Lua]',
-                    })[entry.source.name]
-                    return vim_item
-                end,
-                field = { 'abbr', 'kind', 'menu' }
-            },
-            sources = cmp.config.sources({
-                { name = 'nvim_lsp' },
-                { name = 'luasnip' },
-                { name = 'path' },
-                { name = 'render-markdown' },
-            }, {
-                { name = 'buffer' },
-            })
-        }
+vim.pack.add({
+    'https://github.com/hrsh7th/nvim-cmp',
+    'https://github.com/hrsh7th/cmp-nvim-lsp',
+    'https://github.com/hrsh7th/cmp-buffer',
+    'https://github.com/hrsh7th/cmp-path',
+    'https://github.com/hrsh7th/cmp-cmdline',
+    'https://github.com/hrsh7th/cmp-nvim-lua',
+})

-        cmp.setup.cmdline(':', {
-            mapping = cmp.mapping.preset.cmdline(),
-            sources = cmp.config.sources({
-                { name = 'path' },
-            }, {
-                { name = 'cmdline' },
-            })
-        })
+local cmp = require('cmp')

-        cmp.setup.cmdline({ '/', '?' }, {
-            mapping = cmp.mapping.preset.cmdline(),
-            sources = {
-                { name = 'buffer' }
-            }
-        })
-    end,
-    dependencies = {
-        { 'hrsh7th/cmp-nvim-lsp', lazy = false },
-        { 'hrsh7th/cmp-buffer',   lazy = false },
-        { 'hrsh7th/cmp-path',     lazy = false },
-        { 'hrsh7th/cmp-cmdline',  lazy = false },
-        { 'L3MON4D3/LuaSnip',     lazy = false },
+cmp.setup {
+    completion = {
+        completeopt = 'menu,menuone,noinsert',
    },
-    event = 'InsertEnter',
-    lazy = false,
+    experimental = {
+        ghost_text = true,
+    },
+    mapping = {
+        ['<C-n>'] = cmp.mapping.select_next_item(),
+        ['<C-p>'] = cmp.mapping.select_prev_item(),
+        ['<C-j>'] = cmp.mapping.scroll_docs(-4),
+        ['<C-k>'] = cmp.mapping.scroll_docs(4),
+        ['<C-space>'] = cmp.mapping.complete(),
+        ['<C-y>'] = cmp.mapping.confirm({
+            behavior = cmp.ConfirmBehavior.Insert,
+            select = true,
+        }),
+    },
+    formatting = {
+        format = function(entry, vim_item)
+            vim_item.menu = ({
+                buffer = '[Buf]',
+                luasnip = '[Snips]',
+                nvim_lsp = '[LSP]',
+                nvim_lua = '[Lua]',
+            })[entry.source.name]
+            return vim_item
+        end,
+        field = { 'abbr', 'kind', 'menu' }
+    },
+    sources = cmp.config.sources({
+        { name = 'nvim_lsp' },
+        { name = 'luasnip' },
+        { name = 'path' },
+        { name = 'render-markdown' },
+    }, {
+        { name = 'buffer' },
+    })
 }
+
+cmp.setup.cmdline(':', {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = cmp.config.sources({
+        { name = 'path' },
+    }, {
+        { name = 'cmdline' },
+    })
+})
+
+cmp.setup.cmdline({ '/', '?' }, {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = {
+        { name = 'buffer' }
+    }
+})
--- a/nvim/lua/plugins/render-markdown.lua
+++ b/nvim/lua/plugins/render-markdown.lua
@@ -1,14 +1,13 @@
-return {
-    'meanderingprogrammer/render-markdown.nvim',
-    config = function()
-        require('render-markdown').setup({
-            enabled = true,
-            render_modes = { 'n', 'c', 't' },
-            max_file_size = 10.0,
-            file_types = {
-                'markdown',
-                'telekasten'
-            },
-        })
-    end,
-}
+vim.pack.add({
+    'https://github.com/meanderingprogrammer/render-markdown.nvim'
+})
+
+require('render-markdown').setup({
+    enabled = true,
+    render_modes = { 'n', 'c', 't' },
+    max_file_size = 10.0,
+    file_types = {
+        'markdown',
+        'telekasten'
+    },
+})
--- a/nvim/lua/plugins/telekasten.lua
+++ b/nvim/lua/plugins/telekasten.lua
@@ -2,58 +2,31 @@ function string.insert(str1, str2, pos)
    return str1:sub(1, pos) .. str2 .. str1:sub(pos + 1)
 end

-- function ToggleTODO(current_line)
-    -- local todo_str = '%- %[ %] '
-    -- local todo_checked_str = '%- %[x%] '
+vim.pack.add({
+    'https://github.com/renerocksai/telekasten.nvim'
+})

-    -- if current_line:find(todo_str, 1) then
-        -- return string.gsub(current_line, todo_str, '', 1)
-    -- elseif current_line:find(todo_checked_str, 1) then
-        -- return string.gsub(current_line, todo_checked_str, '', 1)
-    -- else
-        -- local first_idx = current_line:find('[%-%w]', 1) - 1
-        -- return string.insert(current_line, '- [ ] ', first_idx)
-    -- end
-- end
+local home = vim.fn.expand('~/.zettelkasten')
+require('telekasten').setup({
+    home                  = home,
+    dailies               = home .. '/' .. 'daily',
+    weeklies              = home .. '/' .. 'weeklies',
+    templates             = home .. '/' .. 'templates',
+    template_new_note     = home .. '/' .. 'templates/new_note.md',
+    template_new_daily    = home .. '/' .. 'templates/daily.md',
+    template_new_weekly   = home .. '/' .. 'templates/weekly.md',
+    command_palette_theme = 'ivy',
+    show_tags_theme       = 'get_cursor',
+    plug_into_calendar    = false,
+})

-- vim.api.nvim_create_user_command('ToggleTODO', function()
-    -- local current_line = vim.api.nvim_get_current_line()
-    -- local row, _ = unpack(vim.api.nvim_win_get_cursor(0))
+-- Color for telekasten syntax
+vim.api.nvim_set_hl(0, 'tkLink', { ctermfg = 72, cterm = { bold = true, underdouble = true }, fg = '#689d6a', bold = true, underdouble = true })
+vim.api.nvim_set_hl(0, 'tkBrackets', { ctermfg = 'gray', fg = 'gray' })
+vim.api.nvim_set_hl(0, 'tkTag', { ctermfg = 'gray', fg = 'gray' })

-    -- local new_line = ToggleTODO(current_line)
-
-    -- vim.api.nvim_buf_set_lines(0, row - 1, row, true, { new_line })
-- end, {})
-
-return {
-    'renerocksai/telekasten.nvim',
-    config = function()
-        local home = vim.fn.expand('~/.zettelkasten')
-        require('telekasten').setup({
-            home                  = home,
-            dailies               = home .. '/' .. 'daily',
-            weeklies              = home .. '/' .. 'weeklies',
-            templates             = home .. '/' .. 'templates',
-            template_new_note     = home .. '/' .. 'templates/new_note.md',
-            template_new_daily    = home .. '/' .. 'templates/daily.md',
-            template_new_weekly   = home .. '/' .. 'templates/weekly.md',
-            command_palette_theme = 'ivy',
-            show_tags_theme       = 'get_cursor',
-            plug_into_calendar    = false,
-
-        })
-
-        -- Color for telekasten syntax
-        vim.api.nvim_set_hl(0, 'tkLink', { ctermfg = 72, cterm = { bold = true, underdouble = true }, fg = '#689d6a', bold = true, underdouble = true })
-        vim.api.nvim_set_hl(0, 'tkBrackets', { ctermfg = 'gray', fg = 'gray' })
-        vim.api.nvim_set_hl(0, 'tkTag', { ctermfg = 'gray', fg = 'gray' })
-    end,
-    keys = {
-        { '<leader>zt', ':Telekasten toggle_todo<CR>' },
-        { '<leader>zfn', ':Telekasten find_notes<CR>' },
-        { '<leader>zft', ':Telekasten show_tags<CR>' },
-        { '<leader>zn', ':Telekasten new_note<CR>' },
-        { '<leader>zp', ':Telekasten panel<CR>' },
-    },
-    lazy = false
-}
+vim.keymap.set('n', '<leader>zt', ':Telekasten toggle_todo<CR>')
+vim.keymap.set('n', '<leader>zf', ':Telekasten find_notes<CR>')
+vim.keymap.set('n', '<leader>zn', ':Telekasten new_note<CR>')
+vim.keymap.set('n', '<leader>zp', ':Telekasten panel<CR>')
+vim.keymap.set('n', '<leader>zT', ':Telekasten goto_today<CR>')
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -1,148 +1,63 @@
-return {
-    'nvim-telescope/telescope.nvim',
-    config = function(_, opts)
-        local telescope = require('telescope')
-        local actions = require('telescope.actions')
-        local action_state = require('telescope.actions.state')
-        local fb_actions = telescope.extensions.file_browser.actions
+vim.pack.add({
+    'https://github.com/kevinhwang91/nvim-bqf',
+    'https://github.com/nvim-telescope/telescope-file-browser.nvim',
+    'https://github.com/nvim-lua/plenary.nvim',
+    'https://github.com/nvim-telescope/telescope.nvim',
+})

-        opts.defaults = {
-            file_ignore_patterns = {
-                '.png$',
-                '.jpg$',
-                '.jpeg$',
-                '.ico$',
-                '.icns$',
-                '.webp$',
-                '.uproject$',
-                '-workspace$',
-                '.git/',
-                '.node_modules/',
-                'node_modules',
+require('telescope').setup {
+    defaults = {
+        file_ignore_patterns = {
+            '.png$',
+            '.jpg$',
+            '.jpeg$',
+            '.ico$',
+            '.icns$',
+            '.webp$',
+            '.uproject$',
+            '-workspace$',
+            '.git/',
+            '.node_modules/',
+            'node_modules',
+        },
+        layout_config = { prompt_position = 'bottom' },
+        -- layout_strategy = 'vertical',
+        mappings = {
+            i = {
+                ['<ESC>'] = require('telescope.actions').close,
            },
-            layout_config = { prompt_position = 'bottom' },
-            layout_strategy = 'vertical',
-            mappings = {
-                i = {
-                    ['<ESC>'] = actions.close,
-                },
-            },
-            prompt_prefix = '   ',
-            results_title = false,
-            selection_caret = '➤ ',
-            sorting_strategy = 'ascending',
-            winblend = 0,
-        }
-
-        opts.pickers = {
-            diagnostics = {
-                -- theme = 'ivy',
-                initial_mode = 'normal',
-                layout_config = {
-                    preview_cutoff = 9999,
-                },
-            },
-        }
-
-        opts.extensions = {
-            file_browser = {
-                theme = 'dropdown',
-                hijack_netrw = true,
-                mappings = {
-                    ['n'] = {
-                        ['N'] = fb_actions.create,
-                        ['h'] = fb_actions.goto_parent_dir,
-                    },
-                },
-            },
-        }
-
-        telescope.setup(opts)
-        telescope.load_extension('file_browser')
-    end,
-    dependencies = {
-        'nvim-lua/plenary.nvim',
-        'nvim-telescope/telescope-file-browser.nvim',
-        'kevinhwang91/nvim-bqf',
+        },
+        prompt_prefix = '   ',
+        results_title = false,
+        selection_caret = '➤ ',
+        sorting_strategy = 'ascending',
+        winblend = 0,
    },
-    keys = {
-        {
-            ';f',
-            function()
-                require('telescope.builtin').find_files({
-                    no_ignore = false,
-                    hidden = true,
-                })
-            end,
-        },
-        {
-            ';r',
-            function()
-                require('telescope.builtin').live_grep()
-            end,
-        },
-        {
-            ';b',
-            function()
-                require('telescope.builtin').buffers()
-            end,
-        },
-        {
-            ';h',
-            function()
-                require('telescope.builtin').help_tags()
-            end,
-        },
-        {
-            ';;',
-            function()
-                require('telescope.builtin').resume()
-            end,
-        },
-        {
-            ';d',
-            function()
-                require('telescope.builtin').diagnostics()
-            end,
-        },
-        {
-            ';t',
-            function()
-                require('telescope.builtin').treesitter()
-            end,
-        },
-        {
-            ';s',
-            function()
-                require('telescope.builtin').lsp_document_symbols()
-            end
-        },
-        {
-            ';w',
-            function()
-                require('telescope.builtin').lsp_dynamic_workspace_symbols()
-            end
-        },
-        {
-            ';e',
-            function()
-                local telescope = require('telescope')
-
-                local function telescope_buffer_dir()
-                    return vim.fn.expand('%:p:h')
-                end
-
-                telescope.extensions.file_browser.file_browser({
-                    path = '%:p:h',
-                    cwd = telescope_buffer_dir(),
-                    respect_gitignore = false,
-                    hidden = true,
-                    grouped = true,
-                    previewer = false,
-                    initial_mode = 'normal',
-                    layout_config = { height = 40 },
-                })
-            end,
+    pickers = {
+        diagnostics = {
+            -- theme = 'ivy',
+            initial_mode = 'normal',
+            layout_config = {
+                preview_cutoff = 9999,
+            },
        },
    },
 }
+
+local builtin = require('telescope.builtin')
+
+vim.keymap.set('n', ';f', function()
+    builtin.find_files({
+        no_ignore = false,
+        hidden = true,
+    })
+end)
+
+vim.keymap.set('n', ';r', function() builtin.live_grep() end)
+vim.keymap.set('n', ';b', function() builtin.buffers() end)
+vim.keymap.set('n', ';h', function() builtin.help_tags() end)
+vim.keymap.set('n', ';;', function() builtin.resume() end)
+vim.keymap.set('n', ';d', function() builtin.diagnostics() end)
+vim.keymap.set('n', ';t', function() builtin.treesitter() end)
+vim.keymap.set('n', ';s', function() builtin.lsp_document_symbols() end)
+vim.keymap.set('n', ';w', function() builtin.lsp_dynamic_workspace_symbols() end)
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -1,50 +1,55 @@
-return {
-    'nvim-treesitter/nvim-treesitter',
-    build = function()
-        require('nvim-treesitter.install').update({ with_sync = true })
-    end,
-    config = function()
-        require('nvim-treesitter.configs').setup {
-            auto_install = true,
-            ensure_installed = {
-                'c',
-                'c_sharp',
-                'comment',
-                'css',
-                'gdscript',
-                'gitignore',
-                'html',
-                'java',
-                'javascript',
-                'json',
-                'lua',
-                'markdown',
-                'markdown_inline',
-                'python',
-                'query',
-                'rust',
-                'sql',
-                'tera',
-                'toml',
-                'tsx',
-                'typescript',
-                'yaml',
-            },
-            highlight = {
-                enable = true,
-                additional_vim_regex_highlighting = false,
-            },
-            incremental_selection = {
-                enable = true,
-            },
-            indent = {
-                enable = true,
-            },
-            rainbow = {
-                enable = true,
-            }
-        }
+vim.pack.add({
+    'https://github.com/nvim-treesitter/nvim-treesitter'
+})

-        vim.treesitter.language.register('markdown', 'telekasten')
-    end,
-}
+-- require('nvim-treesitter.configs').setup {
+--     auto_install = true,
+--     ensure_installed = {
+--         'c',
+--         'c_sharp',
+--         'comment',
+--         'css',
+--         'gdscript',
+--         'gitignore',
+--         'html',
+--         'java',
+--         'javascript',
+--         'json',
+--         'lua',
+--         'markdown',
+--         'markdown_inline',
+--         'python',
+--         'query',
+--         'rust',
+--         'sql',
+--         'tera',
+--         'toml',
+--         'tsx',
+--         'typescript',
+--         'yaml',
+--     },
+--     highlight = {
+--         enable = true,
+--         additional_vim_regex_highlighting = false,
+--     },
+--     incremental_selection = {
+--         enable = true,
+--     },
+--     indent = {
+--         enable = true,
+--     },
+--     rainbow = {
+--         enable = true,
+--     }
+-- }
+
+vim.treesitter.language.register('markdown', 'telekasten')
+
+-- return {
+--     'nvim-treesitter/nvim-treesitter',
+--     build = function()
+--         require('nvim-treesitter.install').update({ with_sync = true })
+--     end,
+--     config = function()
+--     end,
+-- }
--- a/nvim/lua/plugins/twilight.lua
+++ b/nvim/lua/plugins/twilight.lua
@@ -1,21 +1,19 @@
-return {
-    'folke/twilight.nvim',
-    config = function()
-        require('twilight').setup({
-            dimming = {
-                alpha = 0.3,
-            },
-            context = 6,
-            treesitter = true,
-            expand = {
-                "function",
-                "method",
-                "table",
-                "if_statement",
-            }
-        })
-    end,
-    keys = {
-        { '<leader>f', ':Twilight<CR>' }
+vim.pack.add({
+    'https://github.com/folke/twilight.nvim'
+})
+
+require('twilight').setup({
+    dimming = {
+        alpha = 0.3,
+    },
+    context = 6,
+    treesitter = true,
+    expand = {
+        "function",
+        "method",
+        "table",
+        "if_statement",
    }
-}
+})
+
+vim.keymap.set('n', '<leader>f', ':Twilight<CR>')
--- a/nvim/lua/plugins/vim-gitgutter.lua
+++ b/nvim/lua/plugins/vim-gitgutter.lua
@@ -1,3 +0,0 @@
-return {
-    'airblade/vim-gitgutter'
-}
--- a/nvim/lua/plugins/vim-godot.lua
+++ b/nvim/lua/plugins/vim-godot.lua
@@ -1,4 +0,0 @@
-return {
-    'habamax/vim-godot',
-    ft = 'gdscript',
-}