lazyvim: remove nvim-cmp config

diff --git a/nvim/lua/plugins/coding.lua b/nvim/lua/plugins/coding.lua
index 131fc4acd874948c4d19f94aeeaa5948e7c7f66b..985ccf077398c5b9c508d3508d76f146b51d6e48 100644 (file)
--- a/nvim/lua/plugins/coding.lua
+++ b/nvim/lua/plugins/coding.lua
@@ -21,78 +21,6 @@ return {
     },
   },
 
     },
   },
 

-  -- auto completion
-  {
-    "hrsh7th/nvim-cmp",
-    version = false, -- last release is way too old
-    event = "InsertEnter",
-    dependencies = {
-      "hrsh7th/cmp-nvim-lsp",
-      "hrsh7th/cmp-buffer",
-      "hrsh7th/cmp-path",
-      "saadparwaiz1/cmp_luasnip",
-    },
-    ---@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 = {
-        -- 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",
   -- auto pairs
   {
     "echasnovski/mini.pairs",

diff --git a/nvim/lua/plugins/lang/cpp.lua b/nvim/lua/plugins/lang/cpp.lua
index ff6624ef3a216ad5f4e6d3e9638bf9d178d77613..596c2ea4845536aecb27673e45df602c737c3187 100644 (file)
--- a/nvim/lua/plugins/lang/cpp.lua
+++ b/nvim/lua/plugins/lang/cpp.lua
@@ -92,12 +92,13 @@ return {
     },
   },
 
     },
   },
 

-  {
-    "nvim-cmp",
-    opts = function(_, opts)
-      table.insert(opts.sorting.comparators, 1, require("clangd_extensions.cmp_scores"))
-    end,
-  },
+  -- {
+  --   "blink.cmp",
+  --   opts = function(_, opts)
+  --     -- TODO: make sure this works
+  --     table.insert(opts.fuzzy.sorts, 1, require("clangd_extensions.cmp_scores"))
+  --   end,
+  -- },

 
   {
     "mfussenegger/nvim-dap",
 
   {
     "mfussenegger/nvim-dap",