From f854cccafd1956e7bdfc4c495f13598d836d4d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Sat, 25 Nov 2023 19:15:54 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20cmp=20ad?= =?UTF-8?q?dons=20moved=20to=20extras?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lazy-lock.json | 16 ++-- .config/nvim/lazyvim.json | 3 + .config/nvim/lua/plugins/cmp.lua | 91 ++++++------------- .../lua/plugins/extras/coding/cmp/fonts.lua | 11 +++ .../nvim/lua/plugins/extras/coding/cmp/rg.lua | 13 +++ .../extras/coding/cmp/under-comparator.lua | 11 +++ 6 files changed, 74 insertions(+), 71 deletions(-) create mode 100644 .config/nvim/lua/plugins/extras/coding/cmp/fonts.lua create mode 100644 .config/nvim/lua/plugins/extras/coding/cmp/rg.lua create mode 100644 .config/nvim/lua/plugins/extras/coding/cmp/under-comparator.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index d1039629..7b306202 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { "ChatGPT.nvim": { "branch": "main", "commit": "b50fdaf7836c18e0de2f1def0c1f39d56ef8bced" }, "LazyVim": { "branch": "main", "commit": "68ff818a5bb7549f90b05e412b76fe448f605ffb" }, - "LuaSnip": { "branch": "master", "commit": "cab667e2674881001a86a7478fff7dc7791c63f5" }, - "SchemaStore.nvim": { "branch": "main", "commit": "6316dc88db89d97d190f24547adddd13569fb746" }, + "LuaSnip": { "branch": "master", "commit": "df58ee1664cfda71479cd2bbd56114f56599eba6" }, + "SchemaStore.nvim": { "branch": "main", "commit": "c2c6bd234301876a4bb310be08d23dc45768524d" }, "actions-preview.nvim": { "branch": "master", "commit": "b2c89c2937d527c22deb194d574d2a93246cd869" }, "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" }, "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, @@ -24,7 +24,7 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codeium.vim": { "branch": "main", "commit": "1efe2a2cdf516094bdb211aa8a1d45ef01836207" }, "compiler.nvim": { "branch": "main", "commit": "b2661965cc4a9603642ddb03fb766fd2bd8b2dc9" }, - "conform.nvim": { "branch": "master", "commit": "fd32ed2dc192ec656a0536699336cd2fe3eb543f" }, + "conform.nvim": { "branch": "master", "commit": "cbc510ca5b4aec1fd104b6c6f070a7fcf36cc0c8" }, "crates.nvim": { "branch": "main", "commit": "406295abeb7eedae3bcee3f0db690ada605c629c" }, "debugprint.nvim": { "branch": "main", "commit": "5fce62a2eb7b5233a05da3ac2583676f201ae486" }, "dial.nvim": { "branch": "master", "commit": "019bbe9daea397c93a99adc747f8f071379fee5c" }, @@ -73,7 +73,7 @@ "neotest-python": { "branch": "master", "commit": "c969a5b0073f2b5c8eaf017d1652f9251d761a15" }, "neotest-rust": { "branch": "main", "commit": "46428d9013023f516a61274a78b0cee87fb7e8bc" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, + "nui.nvim": { "branch": "main", "commit": "401a7c65bfd6433e1b0b48d2c246e2621fc44387" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, "nvim-ansible": { "branch": "main", "commit": "d115cb9bb3680c990e2684f58cf333663fff03b8" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, @@ -96,23 +96,23 @@ "nvim-scrollview": { "branch": "main", "commit": "74ab63b598cca206888e83090ed6312aac324b4c" }, "nvim-spectre": { "branch": "master", "commit": "a18a58015b46f02b4fe537ebfffd82e46110ff24" }, "nvim-transparent": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" }, - "nvim-treesitter": { "branch": "master", "commit": "649d137371e9214d30b20565e0574824fa3a3670" }, + "nvim-treesitter": { "branch": "master", "commit": "d8a71826a20dfc9ed3d8a43e28a00611a302b456" }, "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "b8ff464f2afc2000f6c72fa331a8fc090cb46b39" }, "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" }, - "octo.nvim": { "branch": "master", "commit": "5d6bed660ff18878a9096b3acef9c444b85021ac" }, + "octo.nvim": { "branch": "master", "commit": "1ce62d9a29b5eca2c63fb955359f5212e4d1bc7b" }, "one-small-step-for-vimkind": { "branch": "main", "commit": "94b06d81209627d0098c4c5a14714e42a792bf0b" }, "openingh.nvim": { "branch": "main", "commit": "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc" }, "overseer.nvim": { "branch": "master", "commit": "6f462a61ce9a5f47743cbf78454bed14a855eb03" }, "package-info.nvim": { "branch": "master", "commit": "18f8126dd8e65b2e21804c9107785af4abbb5bfc" }, "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, "persistent-breakpoints.nvim": { "branch": "main", "commit": "db2ad5974b0435cb806cd287e7525219d6ac4bd3" }, - "plenary.nvim": { "branch": "master", "commit": "c47e1a21d235a422034012935febd2d078d77ac6" }, + "plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "a2da59bdacb5e3a28873ac7039a16271ac16b224" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "fdd507455a10c3841027c04ab33012d24d5b2c92" }, "rayso.nvim": { "branch": "main", "commit": "debedaa7f0ed754ab16a292a45bbae8dcc3410c5" }, "refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" }, "rest.nvim": { "branch": "main", "commit": "c186d3e5bc5f962fd026daf087fec8364101db57" }, diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 6e24e9a2..86eb5307 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -24,6 +24,9 @@ "plugins.extras.coding.ai.gpt", "plugins.extras.coding.annotation", "plugins.extras.coding.boole", + "plugins.extras.coding.cmp.fonts", + "plugins.extras.coding.cmp.rg", + "plugins.extras.coding.cmp.under-comparator", "plugins.extras.coding.debug.debugprint", "plugins.extras.coding.dial", "plugins.extras.coding.multicursor", diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index a4038d55..b6001d99 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -1,68 +1,33 @@ local cmp = require("cmp") return { - { - "hrsh7th/nvim-cmp", - dependencies = { - { - "petertriho/cmp-git", - }, - { - "amarakon/nvim-cmp-fonts", - }, - { - "lukas-reineke/cmp-under-comparator", - }, - { - "lukas-reineke/cmp-rg", - }, - }, - keys = { - { "ciC", ":CmpStatus", desc = "Cmp Status" }, - }, - opts = function(_, opts) - opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { - { name = "emoji" }, - { name = "git" }, - { name = "fonts", option = { space_filter = "-" } }, - { name = "nerdfont" }, - { name = "rg", keyword_length = 3 }, - })) - opts.mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), - [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), - [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), - [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - [""] = function(fallback) - cmp.abort() - fallback() - end, - }) - opts.window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - } - opts.sorting = { - comparators = { - cmp.config.compare.offset, - cmp.config.compare.exact, - cmp.config.compare.score, - require("cmp-under-comparator").under, - cmp.config.compare.kind, - cmp.config.compare.sort_text, - cmp.config.compare.length, - cmp.config.compare.order, - }, - } - end, + "hrsh7th/nvim-cmp", + keys = { + { "ciC", ":CmpStatus", desc = "Cmp Status" }, }, + opts = function(_, opts) + opts.mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), + [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), + [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), + [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + [""] = function(fallback) + cmp.abort() + fallback() + end, + }) + opts.window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + } + end, } diff --git a/.config/nvim/lua/plugins/extras/coding/cmp/fonts.lua b/.config/nvim/lua/plugins/extras/coding/cmp/fonts.lua new file mode 100644 index 00000000..2d4e4ec0 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/coding/cmp/fonts.lua @@ -0,0 +1,11 @@ +return { + "hrsh7th/nvim-cmp", + dependencies = { + { + "amarakon/nvim-cmp-fonts", + }, + }, + opts = function(_, opts) + table.insert(opts.sources, { name = "fonts", option = { space_filter = "-" } }) + end, +} diff --git a/.config/nvim/lua/plugins/extras/coding/cmp/rg.lua b/.config/nvim/lua/plugins/extras/coding/cmp/rg.lua new file mode 100644 index 00000000..8a8b1f0b --- /dev/null +++ b/.config/nvim/lua/plugins/extras/coding/cmp/rg.lua @@ -0,0 +1,13 @@ +return { + { + "hrsh7th/nvim-cmp", + dependencies = { + { + "lukas-reineke/cmp-rg", + }, + }, + opts = function(_, opts) + table.insert(opts.sources, { name = "rg" }) + end, + }, +} diff --git a/.config/nvim/lua/plugins/extras/coding/cmp/under-comparator.lua b/.config/nvim/lua/plugins/extras/coding/cmp/under-comparator.lua new file mode 100644 index 00000000..fbea7f8e --- /dev/null +++ b/.config/nvim/lua/plugins/extras/coding/cmp/under-comparator.lua @@ -0,0 +1,11 @@ +return { + "hrsh7th/nvim-cmp", + dependencies = { + { + "lukas-reineke/cmp-under-comparator", + }, + }, + opts = function(_, opts) + table.insert(opts.sorting.comparators, 4, require("cmp-under-comparator").under) + end, +}