From db10008f9bdac82b7bfcacd0ca9f929accd5aca0 Mon Sep 17 00:00:00 2001
From: Daniel Carrillo <daniel.carrillo@gmail.com>
Date: Fri, 7 Jun 2024 18:12:31 +0200
Subject: [PATCH] [neovim] Clean cmp keymaps

---
 .config/nvim/lua/core/lazy.lua   |  9 -----
 .config/nvim/lua/plugins/cmp.lua | 66 ++++++--------------------------
 2 files changed, 11 insertions(+), 64 deletions(-)

diff --git a/.config/nvim/lua/core/lazy.lua b/.config/nvim/lua/core/lazy.lua
index a86ecba..d4ad417 100644
--- a/.config/nvim/lua/core/lazy.lua
+++ b/.config/nvim/lua/core/lazy.lua
@@ -172,18 +172,9 @@ require("lazy").setup({
 		dependencies = {
 			"hrsh7th/cmp-buffer",
 			"hrsh7th/cmp-path",
-			"saadparwaiz1/cmp_luasnip",
 			"hrsh7th/cmp-nvim-lsp",
 		},
 	},
-	-- {
-	-- 	"Exafunction/codeium.nvim",
-	-- 	event = "BufEnter",
-	-- },
-
-	-- Snippets
-	{ "L3MON4D3/LuaSnip", version = "v2.*", event = "InsertEnter" },
-	{ "rafamadriz/friendly-snippets" },
 
 	-- LSP
 	{ "neovim/nvim-lspconfig", event = "BufReadPre" },
diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index cf572d3..dddf9a3 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -1,12 +1,4 @@
 local cmp = require("cmp")
-local luasnip = require("luasnip")
-
-require("luasnip/loaders/from_vscode").lazy_load()
-
-local check_backspace = function()
-	local col = vim.fn.col(".") - 1
-	return col == 0 or vim.fn.getline("."):sub(col, col):match("%s")
-end
 
 local kind_icons = {
 	Array = " ",
@@ -37,7 +29,6 @@ local kind_icons = {
 	Package = " ",
 	Property = " ",
 	Reference = " ",
-	Snippet = " ",
 	String = " ",
 	Struct = " ",
 	Text = " ",
@@ -48,52 +39,19 @@ local kind_icons = {
 }
 
 cmp.setup({
-	snippet = {
-		expand = function(args)
-			luasnip.lsp_expand(args.body)
-		end,
-	},
 	mapping = cmp.mapping.preset.insert({
-		["<C-k>"] = cmp.mapping.select_prev_item(),
-		["<C-j>"] = cmp.mapping.select_next_item(),
-		["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }),
-		["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }),
-		["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
-		["<C-q>"] = cmp.mapping({
-			i = cmp.mapping.abort(),
-			c = cmp.mapping.close(),
-		}),
-		-- Accept currently selected item. If none selected, `select` first item.
-		-- Set `select` to `false` to only confirm explicitly selected items.
-		["<CR>"] = cmp.mapping.confirm({ select = true }),
+		["<C-j>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
+		["<C-k>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
+		["<C-Space>"] = cmp.mapping.complete(),
+		["<C-q>"] = cmp.mapping.abort(),
+		["<CR>"] = cmp.mapping.confirm(),
 		["<Tab>"] = cmp.mapping(function(fallback)
-			if cmp.visible() then
-				cmp.select_next_item()
-			elseif luasnip.expandable() then
-				luasnip.expand()
-			elseif luasnip.expand_or_jumpable() then
-				luasnip.expand_or_jump()
-			elseif check_backspace() then
-				fallback()
-			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",
-		}),
+			cmp.select_next_item()
+		end),
+		["<C-CR>"] = function(fallback)
+			cmp.abort()
+			fallback()
+		end,
 	}),
 	formatting = {
 		fields = { "kind", "abbr", "menu" },
@@ -101,7 +59,6 @@ cmp.setup({
 			vim_item.kind = kind_icons[vim_item.kind]
 			vim_item.menu = ({
 				nvim_lsp = "[lsp]",
-				luasnip = "[snip]",
 				buffer = "[local]",
 				copilot = "[AI]",
 				path = "",
@@ -112,7 +69,6 @@ cmp.setup({
 	},
 	sources = {
 		{ name = "nvim_lsp" },
-		{ name = "luasnip" },
 		{ name = "buffer" },
 		{ name = "path" },
 		{ name = "copilot" },