1 files changed, 24 insertions, 28 deletions

diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index 2e8fade..097d413 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -3,14 +3,22 @@ return {
         "hrsh7th/nvim-cmp",
         dependencies = {
             "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-nvim-lsp-signature-help",
             "hrsh7th/cmp-nvim-lua",
             "hrsh7th/cmp-buffer",
             "hrsh7th/cmp-path",
             "hrsh7th/cmp-omni",
-            "hrsh7th/cmp-nvim-lsp-signature-help",
+            "micangl/cmp-vimtex",
             "L3MON4D3/LuaSnip",
             "saadparwaiz1/cmp_luasnip",
         },
+        opts = function(_, opts)
+            opts.sources = opts.sources or {}
+            table.insert(opts.sources, {
+                name = "lazydev",
+                group_index = 0, -- set group index to 0 to skip loading LuaLS completions
+            })
+        end,
         config = function()
             local cmp = require("cmp")
             local luasnip = require("luasnip")
@@ -45,15 +53,13 @@ return {
                 TypeParameter = "",
             }
 
-            ---@diagnostic disable-next-line: missing-fields
             cmp.setup({
                 enabled = function()
                     -- disable autocompletion in telescope prompt
-                    local buftype = vim.api.nvim_buf_get_option(0, "buftype")
+                    local buftype = vim.api.nvim_get_option_value("buftype", {})
 
                     return buftype ~= "prompt"
                 end,
-                ---@diagnostic disable-next-line: missing-fields
                 completion = {
                     completeopt = "menu,menuone,noselect",
                 },
@@ -67,32 +73,25 @@ return {
                     end,
                 },
                 mapping = cmp.mapping.preset.insert({
-                    ["<C-f>"] = cmp.mapping.scroll_docs(-4),
-                    ["<C-d>"] = cmp.mapping.scroll_docs(4),
-                    ["<CR>"] = cmp.mapping.confirm({
+                    ["<C-l>"] = cmp.mapping.confirm({
                         behavior = cmp.ConfirmBehavior.Replace,
-                        select = false,
+                        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()
+                        if luasnip.locally_jumpable(1) then
+                            luasnip.jump(1)
                         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
+                        if luasnip.locally_jumpable(-1) then
                             luasnip.jump(-1)
                         else
                             fallback()
                         end
                     end, { "i", "s" }),
                 }),
-                ---@diagnostic disable-next-line: missing-fields
                 formatting = {
                     fields = { "kind", "abbr", "menu" },
                     format = function(entry, vim_item)
@@ -106,15 +105,18 @@ return {
                             buffer = "[󰮳 ]",
                             path = "[ ]",
                         })[entry.source.name]
-                        return vim_item
+                        -- return vim_item
+                        return require("nvim-highlight-colors").format(entry, vim_item)
                     end,
                 },
                 sources = {
                     { name = "nvim_lsp" },
-                    { name = "nvim_lsp_signature_help" },
-                    { name = "luasnip" },
+                    { name = "nvim_lua" },
                     { name = "buffer" },
                     { name = "path" },
+                    { name = "vimtex" },
+                    { name = "nvim_lsp_signature_help" },
+                    { name = "luasnip" },
                 },
             })
 
@@ -126,7 +128,6 @@ return {
             )
 
             -- use omnifunc in vimwiki to complete paths and tags
-            ---@diagnostic disable-next-line: missing-fields
             cmp.setup.filetype('vimwiki', {
                 sources = cmp.config.sources({
                     { name = "omni" },
@@ -142,7 +143,7 @@ return {
     },
     {
         'mireq/luasnip-snippets',
-        dependencies = {'L3MON4D3/LuaSnip'},
+        dependencies = { 'L3MON4D3/LuaSnip' },
         init = function()
             require('luasnip_snippets.common.snip_utils').setup()
         end
@@ -166,15 +167,10 @@ return {
                 -- Required to automatically include base snippets, like "c" snippets for "cpp"
                 load_ft_func = require('luasnip_snippets.common.snip_utils').load_ft_func,
                 ft_func = require('luasnip_snippets.common.snip_utils').ft_func,
-                -- To enable auto expansin
+                -- To enable auto expansion
                 enable_autosnippets = true,
-                -- Uncomment to enable visual snippets triggered using <c-x>
-                -- store_selection_keys = '<c-x>',
             })
-            -- LuaSnip key bindings
-            vim.keymap.set({"i", "s"}, "<C-l>", function() if ls.expand_or_jumpable() then ls.expand_or_jump() else vim.api.nvim_input('<C-l>') end end, {silent = true})
-            vim.keymap.set({"i", "s"}, "<C-k>", function() ls.jump(-1) end, {silent = true})
-            vim.keymap.set({"i", "s"}, "<C-E>", function() if ls.choice_active() then ls.change_choice(1) end end, {silent = true})
+            require("luasnip.loaders.from_lua").lazy_load({ paths = "./lua/luasnippets" })
         end
 
     },