update completition configuration

config/alacritty/alacritty.yml

@@ -14,8 +14,8 @@ import:
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
 # set by alacritty itself.
-#env:
+env:
-# TERM variable
+  TERM: xterm-256color
 #
 # This value is used to set the `$TERM` environment variable for
 # each instance of Alacritty. If it is not present, alacritty will

config/nvim/init.lua

@@ -24,4 +24,3 @@ require("lazy").setup("aleidk.plugins")
 
 require("aleidk.keymaps")
 require("aleidk.autocmds")
-require("aleidk.IDE")

config/nvim/lua/aleidk/IDE/completion.lua

@@ -1,44 +0,0 @@
--- nvim-cmp setup
-local cmp = require("cmp")
-local luasnip = require("luasnip")
-
-luasnip.config.setup({})
-
-cmp.setup({
-	snippet = {
-		expand = function(args)
-			luasnip.lsp_expand(args.body)
-		end,
-	},
-	mapping = cmp.mapping.preset.insert({
-		["<C-d>"] = cmp.mapping.scroll_docs(-4),
-		["<C-f>"] = cmp.mapping.scroll_docs(4),
-		["<C-Space>"] = cmp.mapping.complete({}),
-		["<CR>"] = cmp.mapping.confirm({
-			behavior = cmp.ConfirmBehavior.Replace,
-			select = true,
-		}),
-		["<Tab>"] = cmp.mapping(function(fallback)
-			if cmp.visible() then
-				cmp.select_next_item()
-			elseif luasnip.expand_or_jumpable() then
-				luasnip.expand_or_jump()
-			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" }),
-	}),
-	sources = {
-		{ name = "nvim_lsp" },
-		{ name = "luasnip" },
-	},
-})

config/nvim/lua/aleidk/IDE/init.lua

@@ -1 +0,0 @@
-require("aleidk.IDE.completion")

config/nvim/lua/aleidk/constants.lua

@@ -50,7 +50,7 @@ return {
 			Package = " ",
 			Property = " ",
 			Reference = " ",
-			Snippet = " ",
+			Snippet = " ",
 			String = " ",
 			Struct = " ",
 			Text = " ",

config/nvim/lua/aleidk/plugins/colorscheme.lua

@@ -1,4 +1,4 @@
-return {
+return { -- Change colors.none if not using a transparent background
 	"catppuccin/nvim",
 	priority = 1000,
 	lazy = false,
@@ -7,7 +7,15 @@ return {
 		transparent_background = true,
 		integrations = {
 			fidget = true,
+			cmp = true,
 		},
+		custom_highlights = function(colors)
+			return {
+				Pmenu = { bg = colors.none, blend = 0 },
+				FloatBorder = { bg = colors.none },
+				CmpItemMenu = { fg = colors.text, bg = colors.none },
+			}
+		end,
 	},
 
 	config = function(_, opts)

config/nvim/lua/aleidk/plugins/completion.lua

@@ -0,0 +1,72 @@
+return {
+	"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",
+	},
+	opts = function()
+		vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
+		local cmp = require("cmp")
+		local defaults = require("cmp.config.default")()
+		local window_opts = {
+			border = "rounded",
+			side_padding = 1,
+			winhighlight = "Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None",
+		}
+		return {
+			completion = {
+				completeopt = "menu,menuone,noinsert",
+			},
+			snippet = {
+				expand = function(args)
+					require("luasnip").lsp_expand(args.body)
+				end,
+			},
+			mapping = cmp.mapping.preset.insert({
+				["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
+				["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
+				["<C-j>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
+				["<C-k>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
+				["<C-u>"] = cmp.mapping.scroll_docs(-4),
+				["<C-d>"] = cmp.mapping.scroll_docs(4),
+				["<C-Space>"] = cmp.mapping.complete(),
+				["<C-e>"] = cmp.mapping.abort(),
+				["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+				["<S-CR>"] = cmp.mapping.confirm({
+					behavior = cmp.ConfirmBehavior.Replace,
+					select = true,
+				}), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+			}),
+			sources = cmp.config.sources({
+				{ name = "nvim_lsp" },
+				{ name = "luasnip" },
+				{ name = "buffer" },
+				{ name = "path" },
+			}),
+			formatting = {
+				fields = { "kind", "abbr", "menu" },
+				format = function(_, item)
+					local icons = require("aleidk.constants").icons.kinds
+					if icons[item.kind] then
+						item.kind = icons[item.kind] .. item.kind
+					end
+					return item
+				end,
+			},
+			window = {
+				completion = cmp.config.window.bordered(window_opts),
+				documentation = cmp.config.window.bordered(window_opts),
+			},
+			experimental = {
+				ghost_text = {
+					hl_group = "CmpGhostText",
+				},
+			},
+			sorting = defaults.sorting,
+		}
+	end,
+}

config/nvim/lua/aleidk/plugins/luasnip.lua

@@ -0,0 +1,27 @@
+return {
+	"L3MON4D3/LuaSnip",
+	dependencies = {
+		"rafamadriz/friendly-snippets",
+		config = function()
+			require("luasnip.loaders.from_vscode").lazy_load()
+		end,
+	},
+	opts = {
+		history = true,
+		delete_check_events = "TextChanged",
+	},
+  -- stylua: ignore
+  keys = {
+    {
+      "<tab>",
+      function()
+        return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>"
+      end,
+      expr = true,
+      silent = true,
+      mode = "i",
+    },
+    { "<tab>",   function() require("luasnip").jump(1) end,  mode = "s" },
+    { "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
+  },
+}