From 9f4b4c111dd53b7c14ccbb6c694b80a44ac87412 Mon Sep 17 00:00:00 2001 From: Alessandro Date: Tue, 24 Sep 2024 10:03:45 +0200 Subject: [PATCH] Reshape cmp box --- nvim/lazy-lock.json | 38 +++++++++++++++++++------------------- nvim/lua/configs/cmp.lua | 20 ++++++++++++++++++++ nvim/lua/mappings.lua | 5 ++--- nvim/lua/options.lua | 2 +- nvim/lua/plugins/init.lua | 4 ++++ nvim/lua/plugins/ufo.lua | 2 +- 6 files changed, 47 insertions(+), 24 deletions(-) create mode 100644 nvim/lua/configs/cmp.lua diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 9494377..2703518 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,36 +1,36 @@ { - "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, - "NvChad": { "branch": "v2.5", "commit": "b7a163e232524f1024a59a0a5c6ddf123530085c" }, + "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, + "NvChad": { "branch": "v2.5", "commit": "8d2bb359e47d816e67ff86b5ce2d8f5abfe2b631" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, - "base46": { "branch": "v2.5", "commit": "5b58434a52f86a9bcc7ee89f8a4da81225b490a9" }, + "base46": { "branch": "v2.5", "commit": "82d71bc6def6a752cbf5fbd0e496aea5f088d940" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, + "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, "crates.nvim": { "branch": "main", "commit": "1c924d5a9ea3496c4e1a02d0d51388ba809f8468" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, - "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, + "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, + "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, - "nvim-lsp-endhints": { "branch": "main", "commit": "d04212224fa791936b84061f66c0209e9056721d" }, - "nvim-lspconfig": { "branch": "master", "commit": "bdbc65aadc708ce528efb22bca5f82a7cca6b54d" }, - "nvim-tree.lua": { "branch": "master", "commit": "ea55ef12036897fdc4476b115a395d2a34965c82" }, - "nvim-treesitter": { "branch": "master", "commit": "3826d0c42ac635f560479b5b6ab522f6627a3466" }, - "nvim-ufo": { "branch": "main", "commit": "5525f422d48f570262611ae2b6aa562c1c428bc5" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "0671e0eabc6842676d3310370e8fae4e1c51d7f9" }, + "nvim-lsp-endhints": { "branch": "main", "commit": "391ef40521b631a8a2fb7aef78db6967ead6b39d" }, + "nvim-lspconfig": { "branch": "master", "commit": "dd329912c8d446240584a2dbcd3802af3a19105a" }, + "nvim-tree.lua": { "branch": "master", "commit": "8405ecfbd6bb08a94ffc9c68fef211eea56e8a3b" }, + "nvim-treesitter": { "branch": "master", "commit": "6511cd984ab4b21e28f83af488f38dc89c3b0586" }, + "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" }, + "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "5f73b24aeb94f5274c218955573153c69ce4d1ee" }, - "rustaceanvim": { "branch": "master", "commit": "3fd3e5c187ad7155d8bf1a689fa5b651407ab22e" }, - "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, - "ui": { "branch": "v2.5", "commit": "7283d036fd6fc2a3352d373dddeb7b1ac27f453f" }, - "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } + "rustaceanvim": { "branch": "master", "commit": "dc0ab4e36f9944901ed8a59878f92c2f818799a7" }, + "telescope.nvim": { "branch": "master", "commit": "b324469959908c1c7434eb65d80e87895e6828f7" }, + "ui": { "branch": "v2.5", "commit": "62f6ede07573a04e7c1a76ec48e7ce19b43d39f3" }, + "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" } } diff --git a/nvim/lua/configs/cmp.lua b/nvim/lua/configs/cmp.lua new file mode 100644 index 0000000..0f33c3b --- /dev/null +++ b/nvim/lua/configs/cmp.lua @@ -0,0 +1,20 @@ +local cmp_ui = require("nvconfig").ui.cmp + +return { + formatting = { + -- default fields order i.e completion word + item.kind + item.kind icons + fields = { "abbr", "kind" }, + + format = function(_, item) + local icons = require "nvchad.icons.lspkind" + local icon = (cmp_ui.icons and icons[item.kind]) or "" + + icon = cmp_ui.lspkind_text and (" " .. icon .. " ") or icon + item.kind = string.format("%s %s", icon, cmp_ui.lspkind_text and item.kind or "") + + item.abbr = item.abbr:match "[^(]+" + item.menu = "" + return item + end, + }, +} diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index 49378ff..004ea78 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -43,8 +43,8 @@ map("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) map("n", "gr", vim.lsp.buf.references, { desc = "Show references" }) map("n", "ld", vim.diagnostic.setloclist, { desc = "LSP Diagnostic loclist" }) map("n", "lr", function() - require "nvchad.lsp.renamer"() - end, {desc = "NvRenamer"}) + require "nvchad.lsp.renamer"() +end, { desc = "NvRenamer" }) -- Git map("n", "gm", "Telescope git_commits", { desc = "telescope git commits" }) @@ -81,4 +81,3 @@ cmp.setup { [""] = cmp.mapping(cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Select }, { "i" }), }, } - diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua index cb6244d..1521965 100644 --- a/nvim/lua/options.lua +++ b/nvim/lua/options.lua @@ -22,4 +22,4 @@ vim.opt.fillchars = { foldclose = "", } - +vim.o.pumheight = 10 diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index ebfebd0..b444974 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -27,4 +27,8 @@ return { "nvim-tree/nvim-tree.lua", opts = require "configs.nvim-tree", }, + { + "hrsh7th/nvim-cmp", + opts = require("configs.cmp"), + }, } diff --git a/nvim/lua/plugins/ufo.lua b/nvim/lua/plugins/ufo.lua index 529c5ad..09eb371 100644 --- a/nvim/lua/plugins/ufo.lua +++ b/nvim/lua/plugins/ufo.lua @@ -2,7 +2,7 @@ return { "kevinhwang91/nvim-ufo", config = function() require("ufo").setup { - provider_selector = function(bufnr, filetype, buftype) + provider_selector = function(_, _, _) return { "treesitter", "indent" } end, }