nvim: cmp configuration

Not all of these might be related.

diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index 547ed757586cba4f3b768b504217d0e2b6ce879c..3939dbcf0dc9717c32cf9f801a0a95936a0376b6 100644 (file)
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -5,6 +5,9 @@ local opt = vim.opt
 vim.g.man_hardwrap = 1
 vim.env.MANWIDTH = 80
 
+-- TODO: also try noinsert
+opt.completeopt = "menu,menuone,noselect"
+
 -- Some settings taken from LazyVim's default options
 opt.pumblend = 10 -- Popup blend
 opt.pumheight = 10 -- Maximum number of entries in a popup

diff --git a/nvim/lua/plugins/coding.lua b/nvim/lua/plugins/coding.lua
index c1b1c39a8e3b61301105fed7e2d8911e91ce0dd0..7bf442fe954d7956c4062b013dae9fea1216a151 100644 (file)
--- a/nvim/lua/plugins/coding.lua
+++ b/nvim/lua/plugins/coding.lua
@@ -15,6 +15,9 @@ return {
     keys = function()
       return {}
     end,
+    opts = {
+      store_selection_keys = "<Tab>",
+    },
   },
 
   -- auto completion
@@ -31,11 +34,32 @@ return {
       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 = vim.tbl_extend("force", opts.mapping, {
+      -- 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()