Cleanup

lua/plugins/cmp.lua

@@ -1,54 +1,29 @@
 return {
     "hrsh7th/nvim-cmp",
-    dependencies = {
-        "hrsh7th/cmp-nvim-lsp",
-        "saadparwaiz1/cmp_luasnip",
-        "hrsh7th/cmp-buffer",
-        "hrsh7th/cmp-path",
-        "hrsh7th/cmp-cmdline",
-        "hrsh7th/cmp-nvim-lua"
-    },
-    event = { "InsertEnter", "CmdlineEnter" },
+    event = "InsertEnter",
+    dependencies = "L3MON4D3/LuaSnip",
     config = function()
+        local lsp_zero = require("lsp-zero")
+        lsp_zero.extend_cmp()
+
         local cmp = require("cmp")
+        local cmp_action = lsp_zero.cmp_action()
 
-        cmp.setup {
-            snippet = {
-                expand = function(args)
-                    require("luasnip").lsp_expand(args.body)
-                end
+        cmp.setup({
+            formatting = lsp_zero.cmp_format(),
+            window = {
+                completion = cmp.config.window.bordered(),
+                documentation = cmp.config.window.bordered()
             },
-
             mapping = cmp.mapping.preset.insert({
-                ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-                ["<C-f>"] = cmp.mapping.scroll_docs(4),
                 ["<C-Space>"] = cmp.mapping.complete(),
-                ["<C-e>"] = cmp.mapping.abort(),
+                ["<C-u>"] = cmp.mapping.scroll_docs(-4),
+                ["<C-d>"] = cmp.mapping.scroll_docs(4),
+                ["<C-f>"] = cmp_action.luasnip_jump_forward(),
+                ["<C-b>"] = cmp_action.luasnip_jump_backward(),
                 ["<CR>"] = cmp.mapping.confirm({ select = true }),
                 ["<Tab>"] = cmp.mapping.select_next_item(),
                 ["<S-Tab>"] = cmp.mapping.select_prev_item()
-            }),
-
-            sources = cmp.config.sources({
-                { name = "nvim_lsp" },
-                { name = "luasnip" }
-            }, {
-                { name = "buffer" },
-                { name = "path" }
-            })
-        }
-
-        cmp.setup.cmdline({ "/", "?" }, {
-            mapping = cmp.mapping.preset.cmdline(),
-            sources = { name = "buffer" }
-        })
-
-        cmp.setup.cmdline(":", {
-            mapping = cmp.mapping.preset.cmdline(),
-            sources = cmp.config.sources({
-                { name = "path" }
-            }, {
-                { name = "cmdline" }
             })
         })
     end