Migrate from nvim-cmp to blink.cmp and from telescope to fzf-lua

.gitignore

@@ -5,3 +5,4 @@ nvim
 
 spell/
 lazy-lock.json
+.repro

lua/custom/plugins/autopairs.lua

@@ -0,0 +1,12 @@
+return {
+  'windwp/nvim-autopairs',
+  -- Optional dependency
+  dependencies = { 'hrsh7th/nvim-cmp' },
+  config = function()
+    require('nvim-autopairs').setup {}
+    -- If you want to automatically add `(` after selecting a function or method
+    local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
+    local cmp = require 'cmp'
+    cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+  end,
+}

lua/custom/plugins/filetree.lua

@@ -0,0 +1,12 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  version = "*",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+    "MunifTanjim/nui.nvim",
+  },
+  config = function ()
+    require('neo-tree').setup {}
+  end,
+}

lua/custom/plugins/hlchunk.txt

@@ -0,0 +1,13 @@
+return {
+  'shellRaining/hlchunk.nvim',
+  event = { 'BufReadPre', 'BufNewFile' },
+  config = function()
+    require('hlchunk').setup {
+      chunk = {
+        enable = false,
+        duration = 150,
+        delay = 1,
+      },
+    }
+  end,
+}

lua/custom/plugins/tabset.lua

@@ -0,0 +1,10 @@
+return {
+  'FotiadisM/tabset.nvim',
+  config = function()
+    require('tabset').setup {
+      defaults = {
+        tabwidth = 4,
+      },
+    }
+  end,
+}

lua/custom/plugins/trouble.lua

@@ -0,0 +1,38 @@
+return {
+  'folke/trouble.nvim',
+  --  branch = 'dev', -- IMPORTANT!
+  cmd = 'Trouble',
+  keys = {
+    {
+      '<leader>xx',
+      '<cmd>Trouble diagnostics toggle<cr>',
+      desc = 'Diagnostics (Trouble)',
+    },
+    {
+      '<leader>xX',
+      '<cmd>Trouble diagnostics toggle filter.buf=0<cr>',
+      desc = 'Buffer Diagnostics (Trouble)',
+    },
+    {
+      '<leader>cs',
+      '<cmd>Trouble symbols toggle focus=false<cr>',
+      desc = 'Symbols (Trouble)',
+    },
+    {
+      '<leader>cl',
+      '<cmd>Trouble lsp toggle focus=false win.position=right<cr>',
+      desc = 'LSP Definitions / references / ... (Trouble)',
+    },
+    {
+      '<leader>xL',
+      '<cmd>Trouble loclist toggle<cr>',
+      desc = 'Location List (Trouble)',
+    },
+    {
+      '<leader>xQ',
+      '<cmd>Trouble qflist toggle<cr>',
+      desc = 'Quickfix List (Trouble)',
+    },
+  },
+  opts = {}, -- for default options, refer to the configuration section for custom setup.
+}

lua/custom/plugins/undotree.lua

@@ -0,0 +1,3 @@
+return {
+  'mbbill/undotree',
+}

lua/kickstart/plugins/debug.lua

@@ -41,7 +41,12 @@ return {
       -- online, please don't ask me how to install them :)
       ensure_installed = {
         -- Update this to ensure that you have the debuggers for the langs you want
-        'delve',
+        'clangd',
+        'json-lsp',
+        'rust-analyzer',
+        'lua-language-server',
+        'stylua',
+        'xmlformatter',
       },
     }
 

lua/lsp/blink.lua

@@ -0,0 +1,39 @@
+return { -- blink autocompletion
+  'saghen/blink.cmp',
+  dependencies = { 'rafamadriz/friendly-snippets' },
+  -- version = '*',
+  build = 'cargo build --release',
+  ---@module 'blink.cmp'
+  ---@type blink.cmp.Config
+  opts = {
+    completion = {
+      documentation = { auto_show = true },
+      list = {
+        selection = {
+          preselect = false,
+        },
+      },
+    },
+    keymap = {
+      preset = 'enter',
+      ['<Tab>'] = { 'select_next', 'fallback' },
+      ['<S-Tab>'] = { 'select_prev', 'fallback' },
+    },
+    appearance = {
+      nerd_font_variant = 'normal',
+    },
+    sources = {
+      -- add lazydev to your completion providers
+      default = { 'lazydev', 'lsp', 'path', 'snippets', 'buffer' },
+      providers = {
+        lazydev = {
+          name = 'LazyDev',
+          module = 'lazydev.integrations.blink',
+          -- make lazydev completions top priority (see `:h blink.cmp`)
+          score_offset = 100,
+        },
+      },
+    },
+  },
+  opts_extend = { 'sources.default' },
+}

lua/lsp/fuzzy.lua

@@ -0,0 +1,18 @@
+return { -- FZF (Telescope replacement)
+  'ibhagwan/fzf-lua',
+  -- optional for icon support
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
+  -- or if using mini.icons/mini.nvim
+  -- dependencies = { 'echasnovski/mini.icons' },
+  opts = {},
+  -- [[ fzf keybinds]]
+  config = function()
+    local fzf = require 'fzf-lua'
+    vim.keymap.set('n', '<leader>sw', fzf.grep_cword, { desc = '[S]earch [W]ord' })
+    vim.keymap.set('n', '<leader>sf', fzf.files, { desc = '[S]earch [F]iles' })
+    vim.keymap.set('n', '<leader>sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
+    vim.keymap.set('n', '<leader>sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
+    vim.keymap.set('n', '<leader>sr', fzf.resume, { desc = '[S]earch [R]esume' })
+    vim.keymap.set('n', '<leader>/', fzf.blines, { desc = '[/] Fuzzily search in current buffer' })
+  end,
+}

lua/lsp/godot_dap.lua

@@ -0,0 +1,22 @@
+return { -- DAP for Godot - https://docs.godotengine.org/en/stable/tutorials/editor/external_editor.html#lsp-dap-support
+  'mfussenegger/nvim-dap',
+  config = function()
+    local dap = require 'dap'
+    dap.adapters.godot = {
+      type = 'server',
+      host = '127.0.0.1',
+      port = 6006,
+    }
+
+    dap.configurations.gdscript = {
+      {
+        launch_game_instance = false,
+        launch_scene = false,
+        name = 'Launch scene',
+        project = '${workspaceFolder}',
+        request = 'launch',
+        type = 'godot',
+      },
+    }
+  end,
+}

lua/lsp/lsp.lua

@@ -0,0 +1,109 @@
+return {
+  'neovim/nvim-lspconfig',
+  dependencies = {
+    -- Automatically install LSPs and related tools to stdpath for Neovim
+    'williamboman/mason.nvim',
+    'williamboman/mason-lspconfig.nvim',
+    'WhoIsSethDaniel/mason-tool-installer.nvim',
+    'saghen/blink.cmp',
+
+    -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+    -- used for completion, annotations and signatures of Neovim apis
+    { 'folke/lazydev.nvim', opts = {} },
+
+    -- Useful status updates for LSP.
+    -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
+    { 'j-hui/fidget.nvim', opts = {} },
+  },
+  config = function()
+    vim.api.nvim_create_autocmd('LspAttach', {
+      group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
+      callback = function(event)
+        -- Automatically highlight copies of the hovered word and then clear on cursor move
+        local client = vim.lsp.get_client_by_id(event.data.client_id)
+        if client and client.server_capabilities.documentHighlightProvider then
+          vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
+            buffer = event.buf,
+            callback = vim.lsp.buf.document_highlight,
+          })
+
+          vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
+            buffer = event.buf,
+            callback = vim.lsp.buf.clear_references,
+          })
+        end
+      end,
+    })
+
+    local servers = {
+      clangd = {},
+      -- gopls = {},
+      -- pyright = {},
+      rust_analyzer = {},
+      powershell_es = {},
+      -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
+      --
+      -- Some languages (like typescript) have entire language plugins that can be useful:
+      --    https://github.com/pmizio/typescript-tools.nvim
+      --
+      -- But for many setups, the LSP (`tsserver`) will work just fine
+      -- tsserver = {},
+      --
+      lua_ls = {
+        -- cmd = {...},
+        -- filetypes = { ...},
+        -- capabilities = {},
+        settings = {
+          Lua = {
+            completion = {
+              callSnippet = 'Replace',
+            },
+            -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
+            diagnostics = { disable = { 'missing-fields' } },
+          },
+        },
+      },
+    }
+
+    require('mason').setup()
+    local ensure_installed = vim.tbl_keys(servers or {})
+    vim.list_extend(ensure_installed, {
+      'stylua', -- Used to format Lua code
+    })
+    require('mason-tool-installer').setup { ensure_installed = ensure_installed }
+
+    require('mason-lspconfig').setup {
+      handlers = {
+        function(server_name)
+          local server = servers[server_name] or {}
+          server.capabilities = require('blink.cmp').get_lsp_capabilities(server.capabilities)
+          require('lspconfig')[server_name].setup(server)
+        end,
+
+        powershell_es = function()
+          local lspconfig = require 'lspconfig'
+          lspconfig.powershell_es.setup {
+            init_options = { enableProfileLoading = false },
+            filetypes = { 'ps1' },
+            on_attach = function(client, bufnr)
+              vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+            end,
+            settings = { powershell = { codeFormatting = { Preset = 'OTBS' } } },
+          }
+        end,
+      },
+    }
+    -- Godot's LSP - Requires Godot to be running
+    if vim.fn.has 'win32' then
+      require('lspconfig')['gdscript'].setup {
+        cmd = { 'ncat', '127.0.0.1', '6005' },
+        name = 'godot',
+      }
+    else
+      require('lspconfig')['gdscript'].setup {
+        cmd = vim.lsp.rpc.connect('127.0.0.1', 6005),
+        name = 'godot',
+      }
+    end
+  end,
+}

lua/misc/blink.nvim.lua

@@ -0,0 +1,37 @@
+return {
+  'saghen/blink.nvim',
+  build = 'cargo build --release', -- for delimiters
+  keys = {
+    -- chartoggle
+    {
+      ';',
+      function()
+        require('blink.chartoggle').toggle_char_eol ';'
+      end,
+      mode = { 'n', 'v' },
+      desc = 'Toggle ; at eol',
+    },
+    {
+      ',',
+      function()
+        require('blink.chartoggle').toggle_char_eol ','
+      end,
+      mode = { 'n', 'v' },
+      desc = 'Toggle , at eol',
+    },
+
+    --[[
+    -- tree
+    { '<C-e>', '<cmd>BlinkTree reveal<cr>', desc = 'Reveal current file in tree' },
+    { '<leader>E', '<cmd>BlinkTree toggle<cr>', desc = 'Reveal current file in tree' },
+    { '<leader>e', '<cmd>BlinkTree toggle-focus<cr>', desc = 'Toggle file tree focus' },
+    --]]
+  },
+  -- all modules handle lazy loading internally
+  lazy = false,
+  opts = {
+    chartoggle = { enabled = true },
+    indent = { enabled = false },
+    tree = { enabled = false },
+  },
+}