Skip to content

Commit

Permalink
neovim: Update nvim-cmp (#3604)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yutkat
yutkat authored Oct 8, 2024
1 parent aec5ab9 commit 617cef1
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 36 deletions.
30 changes: 15 additions & 15 deletions .config/nvim/lazy-lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"colorful-winsep.nvim": { "branch": "main", "commit": "4ac6a8cab5866ec3de3f5e3bc202e0c682d4d806" },
"comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
"confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" },
"conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" },
"conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" },
"convert-git-url.nvim": { "branch": "main", "commit": "fd97c92a627175546f8572088b2b240b92f2790d" },
"copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" },
"csv-tools.lua": { "branch": "master", "commit": "e11c322178d4ff9fdc0418a657e8f1f74f1ce247" },
Expand All @@ -44,7 +44,7 @@
"eyeliner.nvim": { "branch": "main", "commit": "8f197eb30cecdf4c2cc9988a5eecc6bc34c0c7d6" },
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
"friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"git-conflict.nvim": { "branch": "main", "commit": "ed1ca6dfd60bf609714f791cfa63aee33aef64ed" },
"git-rebase-auto-diff.nvim": { "branch": "main", "commit": "ad95f18cb85c24ddc0b48bf190bc313dfc58e2d6" },
"gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
Expand All @@ -53,7 +53,7 @@
"hlargs.nvim": { "branch": "main", "commit": "53ec5d8ca6ed012de5545ba83ea1eb3d636b09fb" },
"hover.nvim": { "branch": "main", "commit": "4339cbbcb572b1934c53dcb66ad4bf6a0abb7918" },
"hydra.nvim": { "branch": "main", "commit": "7f5341643107d05a8d7d4fdea00b29af28517380" },
"indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
"indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
"interestingwords.nvim": { "branch": "master", "commit": "fa7796353266ce9a5de6a95a8e332814f09a5514" },
"iron.nvim": { "branch": "master", "commit": "e6b78ec1bc56eab63b3a9112d348b3d79836b672" },
"iswap.nvim": { "branch": "master", "commit": "e02cc91f2a8feb5c5a595767d208c54b6e3258ec" },
Expand All @@ -73,9 +73,9 @@
"mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
"modicator.nvim": { "branch": "main", "commit": "d1d327fd4bdfc3af4cfdf83b85c2eaefa71de7a8" },
"neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
"neoconf.nvim": { "branch": "main", "commit": "34c822ef117dced4658cfef8803e615128528f3d" },
"neoconf.nvim": { "branch": "main", "commit": "545b57d48d4bbc8f426aade4f2122c8296e9a0c0" },
"neogen": { "branch": "main", "commit": "e932ba918b56723436b77aa3efb844a11b2851ab" },
"neogit": { "branch": "master", "commit": "a021838dc2762cfc1c1808e56e112c36f5ca2154" },
"neogit": { "branch": "master", "commit": "c3ff049446e0920d02a5828c4e3619243d3c6e15" },
"nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" },
"noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
"nredir.nvim": { "branch": "main", "commit": "22cdf3aaf43d563b27c5bbbd31da5ab23efec972" },
Expand All @@ -91,14 +91,14 @@
"nvim-cursorword": { "branch": "master", "commit": "c0f2958ec729b47be2dba0d79ef43d005dac9f4e" },
"nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "3497eb39bf413a57ab5b7e7e2e192683e462148c" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "52638640ae309cacdaff785fdbb854437bd1ee5c" },
"nvim-gtd": { "branch": "main", "commit": "ad6d228045b4083230afd0dcf4c840737c1b499c" },
"nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" },
"nvim-hlslens": { "branch": "main", "commit": "07afd4dd14405ad14b142a501a3abea6ae44b21b" },
"nvim-insx": { "branch": "main", "commit": "af5f076d5ad26976f75376107b86338f67f78cf3" },
"nvim-lint": { "branch": "master", "commit": "27f44d1cc3d733a38a736acb902f94879d99c76c" },
"nvim-lsp-smag": { "branch": "master", "commit": "add830cb376ebe3daac3f63b7f4349c499090918" },
"nvim-lspconfig": { "branch": "master", "commit": "fb453a1a443b6ea6b54a1e4c101b1160c9d37950" },
"nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" },
"nvim-luadev": { "branch": "master", "commit": "3ba0c02c378503739f1fdb95cff3ea2aad48db3e" },
"nvim-luapad": { "branch": "master", "commit": "176686eb616a5ada5dfc748f2b5109194bbe8a71" },
"nvim-neoclip.lua": { "branch": "main", "commit": "32e05f2d23dc5b6a284a688c0535a83d1bfc633f" },
Expand All @@ -114,20 +114,20 @@
"nvim-test": { "branch": "main", "commit": "e06f3d029ee161f3ead6193cf27354d1eb8723c3" },
"nvim-tree-docs": { "branch": "master", "commit": "5db023d783da1e55339e5e25caaf72a59597e626" },
"nvim-treehopper": { "branch": "master", "commit": "e87002968983ed23836dfad53bcf023e609db42d" },
"nvim-treesitter": { "branch": "master", "commit": "cc2c11c403a9143827501223b4ee64432dcaf246" },
"nvim-treesitter-context": { "branch": "master", "commit": "63374d1c36050fdea7a773aa4125b45e9a8da8f5" },
"nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" },
"nvim-treesitter-context": { "branch": "master", "commit": "78a81c7494e7d1a08dd1200b556933e513fd9f29" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "4a2d05ec24eaa6b655c7d19092a3b6c0219d46b9" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "44fd461b879d80a21d5041f312f070f22551c0bc" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "b91c98afa6c42819aea6cbc1ba38272f5456a5cf" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
"nvim-various-textobjs": { "branch": "main", "commit": "cc33e0a6681bbe913de515ac1a68492d50cbf949" },
"nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" },
"nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" },
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
"nvim-yati": { "branch": "main", "commit": "df3dc06076c6fe20a1dcd8643e712af5c252d042" },
"nvim_context_vt": { "branch": "master", "commit": "03fb506bbd5fdbb2b21ac6b0fe38ed40e339b143" },
"octo.nvim": { "branch": "master", "commit": "29d4ed4463ce4f487a3d4d0b5a649ab943e62fae" },
"one-small-step-for-vimkind": { "branch": "main", "commit": "0f0d5bc67786c36edc2cb6fb5faa5c09dd1a6e10" },
"other.nvim": { "branch": "main", "commit": "252cc279eb3d76685ef48aaeced1c3cf9793581f" },
"overseer.nvim": { "branch": "master", "commit": "b433b8950cf6d43297390a22948dce23d01c83d7" },
"overseer.nvim": { "branch": "master", "commit": "965f8159408cee5970421ad36c4523333b798502" },
"package-info.nvim": { "branch": "master", "commit": "268f4669fc29546726009ad665d26901dbf62c3b" },
"peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
Expand All @@ -139,7 +139,7 @@
"rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" },
"registers.nvim": { "branch": "main", "commit": "17df665d3fd8995b69a1a434cb285a25ab22cc49" },
"replacer.nvim": { "branch": "master", "commit": "32e1713230844fa52f7f0598c59295de3c90dc95" },
"rustaceanvim": { "branch": "master", "commit": "29f42cc149f915d771c550b6dfe7c788d856cf04" },
"rustaceanvim": { "branch": "master", "commit": "d1f56672638508a7bc971cde31a29df4018579a9" },
"save-clipboard-on-exit.nvim": { "branch": "main", "commit": "506d6970026e1c2e59a42ecdc7378fe908da8a0b" },
"scrap.nvim": { "branch": "main", "commit": "fde44cd73cd3e8465cf393c60e26fb1c238633b3" },
"sidebar.nvim": { "branch": "main", "commit": "5695712eef6288fff667343c4ae77c54911bdb1b" },
Expand All @@ -161,7 +161,7 @@
"telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" },
"telescope.nvim": { "branch": "master", "commit": "eae0d8fbde590b0eaa2f9481948cd6fd7dd21656" },
"telescope.nvim": { "branch": "master", "commit": "dc6fc321a5ba076697cca89c9d7ea43153276d81" },
"template.nvim": { "branch": "main", "commit": "59955db23613985e031d340756d5c01aebd583a3" },
"term-gf.nvim": { "branch": "main", "commit": "be02449c0edbe24d624ae8347561f255056019ca" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
Expand Down
46 changes: 25 additions & 21 deletions .config/nvim/lua/rc/pluginconfig/nvim-cmp.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ local t = function(str)
end

cmp.setup({
performance = {
debounce = 0, -- default is 60ms
throttle = 0, -- default is 30ms
},
formatting = {
-- fields = {'abbr', 'kind', 'menu'},
format = require("lspkind").cmp_format({
Expand Down Expand Up @@ -137,26 +141,26 @@ cmp.setup({
end
end, { "i", "s" }),
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
["<C-y>"] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
["<C-y>"] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
["<C-q>"] = cmp.mapping({ i = cmp.mapping.abort(), c = cmp.mapping.close() }),
["<CR>"] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
},
-- LuaFormatter off
sources = cmp.config.sources({
{ name = "copilot", priority = 90 }, -- For luasnip users.
{ name = "nvim_lsp", priority = 100 },
{ name = "cmp_tabnine", priority = 30 },
{ name = "luasnip", priority = 20 }, -- For luasnip users.
{ name = "path", priority = 100 },
{ name = "emoji", insert = true, priority = 60 },
{ name = "nvim_lua", priority = 50 },
{ name = "copilot", priority = 90 }, -- For luasnip users.
{ name = "nvim_lsp", priority = 100 },
{ name = "cmp_tabnine", priority = 30 },
{ name = "luasnip", priority = 20 }, -- For luasnip users.
{ name = "path", priority = 100 },
{ name = "emoji", insert = true, priority = 60 },
{ name = "nvim_lua", priority = 50 },
{ name = "nvim_lsp_signature_help", priority = 80 },
}, {
{ name = "buffer", priority = 50 },
{ name = "buffer", priority = 50 },
-- slow
-- { name = "omni", priority = 40 },
{ name = "spell", priority = 40 },
{ name = "calc", priority = 50 },
{ name = "spell", priority = 40 },
{ name = "calc", priority = 50 },
{ name = "treesitter", priority = 30 },
{ name = "dictionary", keyword_length = 2, priority = 10 },
}),
Expand All @@ -165,20 +169,20 @@ cmp.setup({

cmp.setup.filetype({ "gitcommit", "markdown" }, {
sources = cmp.config.sources({
{ name = "copilot", priority = 90 }, -- For luasnip users.
{ name = "nvim_lsp", priority = 100 },
{ name = "copilot", priority = 90 }, -- For luasnip users.
{ name = "nvim_lsp", priority = 100 },
{ name = "cmp_tabnine", priority = 30 },
{ name = "luasnip", priority = 80 }, -- For luasnip users.
{ name = "rg", priority = 70 },
{ name = "path", priority = 100 },
{ name = "emoji", insert = true, priority = 60 },
{ name = "luasnip", priority = 80 }, -- For luasnip users.
{ name = "rg", priority = 70 },
{ name = "path", priority = 100 },
{ name = "emoji", insert = true, priority = 60 },
}, {
{ name = "buffer", priority = 50 },
{ name = "buffer", priority = 50 },
-- { name = "omni", priority = 40 },
{ name = "spell", priority = 40 },
{ name = "calc", priority = 50 },
{ name = "spell", priority = 40 },
{ name = "calc", priority = 50 },
{ name = "treesitter", priority = 30 },
{ name = "mocword", priority = 60 },
{ name = "mocword", priority = 60 },
{ name = "dictionary", keyword_length = 2, priority = 10 },
}),
})
Expand Down

0 comments on commit 617cef1

Please sign in to comment.