lazyvim: remove nvim-cmp config

[dotfiles.git] / nvim / lua / plugins / coding.lua

diff --git a/nvim/lua/plugins/coding.lua b/nvim/lua/plugins/coding.lua
index 7bf442fe954d7956c4062b013dae9fea1216a151..985ccf077398c5b9c508d3508d76f146b51d6e48 100644 (file)
--- a/nvim/lua/plugins/coding.lua
+++ b/nvim/lua/plugins/coding.lua
@@ -9,6 +9,7 @@ return {
         "honza/vim-snippets",
         config = function()
           require("luasnip.loaders.from_snipmate").lazy_load()
+          require("luasnip.loaders.from_lua").load({ paths = vim.fn.stdpath("config") .. "/lua/snippets" })
         end,
       },
     },
@@ -20,70 +21,6 @@ return {
     },
   },
 
-  -- auto completion
-  {
-    "hrsh7th/nvim-cmp",
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      local has_words_before = function()
-        unpack = unpack or table.unpack
-        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-      end
-
-      local cmp = require("cmp")
-      local luasnip = require("luasnip")
-
-      local upstream_format = opts.formatting.format
-      opts.formatting.format = function(entry, vim_item)
-        vim_item = upstream_format(entry, vim_item)
-        local menu = {
-          nvim_lsp = "[lsp]",
-          luasnip = "[snip]",
-          buffer = "[buf]",
-          path = "[path]",
-        }
-        vim_item.menu = menu[entry.source.name]
-        return vim_item
-      end
-
-      opts.completion = vim.tbl_extend("force", opts.completion, {
-        completeopt = "menu,menuone,noselect",
-      })
-      -- TODO: review if I want to keep any of LazyVim's mappings
-      opts.mapping = cmp.mapping.preset.insert({
-        -- lazyvims
-        ["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
-        ["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
-        ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-        ["<C-f>"] = cmp.mapping.scroll_docs(4),
-        ["<C-e>"] = cmp.mapping.abort(),
-        ["<C-Space>"] = cmp.mapping.complete(),
-        -- mine
-        ["<Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-          elseif luasnip.expand_or_jumpable() then
-            luasnip.expand_or_jump()
-          elseif has_words_before() then
-            cmp.complete()
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif luasnip.jumpable(-1) then
-            luasnip.jump(-1)
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-      })
-    end,
-  },
-
   -- auto pairs
   {
     "echasnovski/mini.pairs",
@@ -92,10 +29,16 @@ return {
   -- surround
   {
     "echasnovski/mini.surround",
-    keys = {
-      { "S", "<cmd><C-u>lua MiniSurround.add('visual')<cr>", "x" },
-      { "yss", "ys_", remap = true },
-    },
+    keys = function()
+      -- HACK: use function to disable merging with LazyVim's keys definition
+      return {
+        { "ys", desc = "Add surrounding", "n" },
+        { "S", desc = "Add surrounding", "x" },
+        { "ds", desc = "Delete surrounding" },
+        { "cs", desc = "Change surrounding" },
+        { "yss", "ys_", remap = true },
+      }
+    end,
     opts = {
       mappings = {
         -- TODO: this is tpope/surround like, but should consider using vim-sandwich mappings
@@ -109,6 +52,12 @@ return {
         update_n_lines = "",
       },
     },
+    config = function(_, opts)
+      require("mini.surround").setup(opts)
+      -- remap visual
+      vim.keymap.del("x", "ys", { silent = true })
+      vim.keymap.set("x", "S", [[:<C-u>lua MiniSurround.add('visual')<CR>]], { silent = true })
+    end,
   },
   -- comments
   {