From 7af9add44aa07ee4a25468aed5936a55d236a08d Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Sun, 15 Dec 2024 23:23:09 -0600 Subject: [PATCH] feat(nvim): initial migration to `blink.cmp` --- users/price/dots/.config/nvim/lazy-lock.json | 100 ++--- .../nvim/lua/plugins/configs/blink.lua | 167 ++++++++ .../.config/nvim/lua/plugins/configs/cmp.lua | 370 ------------------ .../nvim/lua/plugins/configs/kanagawa.lua | 58 +-- .../.config/nvim/lua/plugins/configs/lsp.lua | 2 +- 5 files changed, 240 insertions(+), 457 deletions(-) create mode 100644 users/price/dots/.config/nvim/lua/plugins/configs/blink.lua delete mode 100644 users/price/dots/.config/nvim/lua/plugins/configs/cmp.lua diff --git a/users/price/dots/.config/nvim/lazy-lock.json b/users/price/dots/.config/nvim/lazy-lock.json index 14479424..36bb2b47 100644 --- a/users/price/dots/.config/nvim/lazy-lock.json +++ b/users/price/dots/.config/nvim/lazy-lock.json @@ -1,123 +1,109 @@ { "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "LuaSnip": { "branch": "master", "commit": "2592b91577136dbb355a4708be1e60619456b7f6" }, + "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, + "blink-ripgrep.nvim": { "branch": "main", "commit": "1310286ad9ffd9261b0dd70024ce927a0dc660e3" }, + "blink.cmp": { "branch": "main", "commit": "12ffc10c6283ac148a89d72b5540d819fc80e2ff" }, + "blink.compat": { "branch": "main", "commit": "73249d35c8737b614bed64c2f33277387035f8ec" }, "busted": { "branch": "main", "commit": "5ed85d0e016a5eb5eca097aa52905eedf1b180f1" }, "ccc.nvim": { "branch": "main", "commit": "7c639042583c7bdc7ce2e37e5a0e0aa6d0659c6a" }, "cmdbuf.nvim": { "branch": "main", "commit": "a5c668512446f6e68ef7ac31ab32d85027af50dc" }, - "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" }, - "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, - "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" }, - "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, - "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, - "cmp-fuzzy-buffer": { "branch": "main", "commit": "ada6352bc7e3c32471ab6c08f954001870329de1" }, - "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" }, - "cmp-npm": { "branch": "main", "commit": "2337f109f51a09297596dd6b538b70ccba92b4e4" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, - "cmp-rg": { "branch": "master", "commit": "70a43543f61b6083ba9c3b7deb9ccee671410ac6" }, - "cmp-zsh": { "branch": "main", "commit": "c24db8e58fac9006ec23d93f236749288d00dec9" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" }, - "csharpls-extended-lsp.nvim": { "branch": "master", "commit": "c788fed627827238de348195c3f318cd090e8e77" }, + "csharpls-extended-lsp.nvim": { "branch": "master", "commit": "77c46fe05cbc44b292442f1a768b955a6fd01d9c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "direnv.nvim": { "branch": "main", "commit": "eec36a38285457c4e5dea2c6856329a9a20bd3a4" }, "exrc.nvim": { "branch": "master", "commit": "4346164895f432f361e453d837b612e6c7cbe3e6" }, "flatten.nvim": { "branch": "main", "commit": "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fuzzy.nvim": { "branch": "master", "commit": "68608f6a232f7e73ccf81437bf12108128f15bd4" }, - "github-preview.nvim": { "branch": "main", "commit": "3af3da00bbdf0306343ba8a8a05d721780e08150" }, + "github-preview.nvim": { "branch": "main", "commit": "b78d1af90fd521eaa8c73d1ac5fe5dbc9f9c1296" }, "gitlinker.nvim": { "branch": "master", "commit": "df0c4e342742812186f87e32caf82b3e5e288a84" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "go.nvim": { "branch": "master", "commit": "c6d5ca26377d01c4de1f7bff1cd62c8b43baa6bc" }, - "grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" }, + "grug-far.nvim": { "branch": "main", "commit": "11d0fbd6fff6f4e394af95319deeaab4ef88ce97" }, "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" }, "gx.nvim": { "branch": "main", "commit": "b01db725a001e4215f363159fc04727f6fde0a1c" }, "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" }, "heirline.nvim": { "branch": "master", "commit": "cc359b628266cb9a84b2d71c883f2b99e16473a0" }, "highlight-undo.nvim": { "branch": "main", "commit": "5f588b420179a31d7073854bfd07ed9d5f364645" }, "hlargs.nvim": { "branch": "main", "commit": "53ec5d8ca6ed012de5545ba83ea1eb3d636b09fb" }, - "hop.nvim": { "branch": "master", "commit": "08ddca799089ab96a6d1763db0b8adc5320bf050" }, - "hurl.nvim": { "branch": "main", "commit": "839784128048251ea9169264b72eaee171fbb1bd" }, + "hop.nvim": { "branch": "master", "commit": "efe58182f71fbe592f82fb211ab026f2819e855d" }, + "hurl.nvim": { "branch": "main", "commit": "bc8d748a3754f63d50ee8dfd54e20de80f22754c" }, "hydra.nvim": { "branch": "main", "commit": "68ae20eb732f4f722dd7158adecf55de431ff26d" }, "img-clip.nvim": { "branch": "main", "commit": "5ff183655ad98b5fc50c55c66540375bbd62438c" }, - "inc-rename.nvim": { "branch": "main", "commit": "1871ca49ae6ee3e9ebee37955ba10c7b1425974f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, + "inc-rename.nvim": { "branch": "main", "commit": "f4e13df6e2d0b3177a7305dbc1cc7f7ea44b94f1" }, + "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, "kanagawa.nvim": { "branch": "master", "commit": "ad3dddecd606746374ba4807324a08331dfca23c" }, - "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, "live-command.nvim": { "branch": "main", "commit": "b0723697bf60d89ede953c4a5fedce3157784c15" }, - "lsp_lines.nvim": { "branch": "main", "commit": "7d9e2748b61bff6ebba6e30adbc7173ccf21c055" }, - "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, + "lsp_lines.nvim": { "branch": "main", "commit": "f7f18b85360b8e85cd6a5418c9fbccb6a2ff4b1b" }, "lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" }, "luassert": { "branch": "main", "commit": "d3528bb679302cbfdedefabb37064515ab95f7b9" }, "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" }, "markview.nvim": { "branch": "main", "commit": "72cd34279e94ee96ee33bdf30a87b00e6d45319d" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "ad46fda7862153107124f95d4ea0e510eafc1dd8" }, + "mini.nvim": { "branch": "main", "commit": "7ebfab26d77a4b9b05aaae565907e7fa4b2ee154" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "main", "commit": "42caaf5c3b7ca346ab278201151bb878006a6031" }, + "neo-tree.nvim": { "branch": "main", "commit": "d7266e467de1adbaf775cbd4bff9b68842e27386" }, "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" }, - "neogen": { "branch": "main", "commit": "e3b8f6dca1c67c73ae2817418d39c061fdb65064" }, - "neogit": { "branch": "master", "commit": "446197d90d179d579fa9c6970d4f98d494a2090b" }, + "neogen": { "branch": "main", "commit": "37dd095892e3f846418c465852f7b21f81d0f46c" }, + "neogit": { "branch": "master", "commit": "cfea08ebb2fda22f1357e413d4ea45dcda6fcab5" }, "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" }, "neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" }, "neotest-plenary": { "branch": "master", "commit": "3523adcf9ffaad1911960c5813b0136c1b63a2ec" }, - "netman.nvim": { "branch": "main", "commit": "68eecb29d913d4f35efa9bd0e8636046f70f998f" }, + "netman.nvim": { "branch": "main", "commit": "99c2e1e4e98b5d0b05eeea89f54f801b63f4cbfe" }, "nibbler": { "branch": "main", "commit": "9ca67e731f4bd99e1877c9255b3957d5ced6ce04" }, - "noice.nvim": { "branch": "main", "commit": "c6f6fb178ebe9b4fd90383de743c3399f8c3a37c" }, - "none-ls.nvim": { "branch": "main", "commit": "fc2af03aee220caba07684583be22fb5de81d6d3" }, - "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, + "none-ls.nvim": { "branch": "main", "commit": "c279e541f73a2deea9deb5231b9c037678dd6353" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "c9135e36779f036936e8305383126740c39f5d0f" }, "nvim-cmp-lua-latex-symbols": { "branch": "master", "commit": "89345d6e333c700d13748e8a7ee6fe57279b7f88" }, - "nvim-dap": { "branch": "master", "commit": "0a0daa796a5919a51e5e5019ffa91219c94c4fef" }, + "nvim-dap": { "branch": "master", "commit": "567da83810dd9da32f9414d941bc6848715fc102" }, "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, "nvim-fundo": { "branch": "main", "commit": "ac9c9372c4bf677721e24f144ef29d3a05c2b589" }, - "nvim-java": { "branch": "main", "commit": "905013eb83c58bda992724b3ecbe20f60b58513f" }, + "nvim-java": { "branch": "main", "commit": "a36f50c82f922f352d4ce7ac6a3c6b238b3e0a36" }, "nvim-java-core": { "branch": "main", "commit": "5b03dca22fee76524a89e1c2dc1d73a9f0b1a3bb" }, "nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" }, "nvim-java-refactor": { "branch": "main", "commit": "ea1420fed5463c9cc976c2b4175f434b3646f0f7" }, "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" }, "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, "nvim-lightbulb": { "branch": "master", "commit": "33d4c95e0e853956bc9468b70b3064c87d5abaca" }, - "nvim-lspconfig": { "branch": "master", "commit": "eb20f0a9cc809bb261a183a554d1087aeca8d7af" }, + "nvim-lspconfig": { "branch": "master", "commit": "ae8a01bb40848490548e5d07b97ed972ed43c2f9" }, "nvim-neoclip.lua": { "branch": "main", "commit": "32e05f2d23dc5b6a284a688c0535a83d1bfc633f" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, - "nvim-treesitter": { "branch": "master", "commit": "70d44dad700512460aa76e9299ed00e0f53f3164" }, + "nvim-treesitter": { "branch": "master", "commit": "54a29bf99d5ccb2de512906279686457d699f8e5" }, "nvim-treesitter-endwise": { "branch": "fix/iter-matches", "commit": "a210e4c96e7b4b872be6026293a8f6e6bea05175" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-ts-autotag": { "branch": "main", "commit": "f2d24aca1bcbbd2c0306fd93d52e3697027b77ff" }, - "nvim-ufo": { "branch": "main", "commit": "9afe89f9323c67584bfc7bfa216e0df1b745c5cc" }, - "nvim-various-textobjs": { "branch": "main", "commit": "c9b068f77a5de75e78e849cb40797807f1a6ab6b" }, - "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, - "octo.nvim": { "branch": "master", "commit": "14d412f517a3cbea4cd4299207ee067fde542062" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, + "nvim-ufo": { "branch": "main", "commit": "95cbe2e99901135704aabdc8732d722cf68b12c9" }, + "nvim-various-textobjs": { "branch": "main", "commit": "d3ccc9896e8fd81063196352426f78c5085a13a3" }, + "nvim-web-devicons": { "branch": "master", "commit": "1736cb81bdc42e1ee206081a161bdb2af68fb7a1" }, + "octo.nvim": { "branch": "master", "commit": "1fee3592194d7d90d65382401b59ffb008983a19" }, "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4916fa12e5b28d21a1f031f0bdd10aa15a75d85d" }, "open-browser.vim": { "branch": "master", "commit": "7d4c1d8198e889d513a030b5a83faa07606bac27" }, - "orgmode": { "branch": "master", "commit": "1d8c9b9417f8c8e9fb146d4f54fb1e90a4f7e534" }, + "orgmode": { "branch": "master", "commit": "f8c0fd3006776bf2cd3f0b7d5cc0b50816aa47b0" }, "overseer.nvim": { "branch": "master", "commit": "10ee48ff96c8d1049efb278ea4c8cf9f3b0e4326" }, "plantuml-previewer.vim": { "branch": "master", "commit": "368a1f331c1ff29f6a3ee76facfca39a7f374b13" }, "plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "ppd.nvim": { "branch": "main", "commit": "05f62c79fa81501691411ac368962eac1d197d1b" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "d803ba7668ba390aa4cfd3580183c982cac36fd8" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "77e5bad54227dcfe3878ffbda88ab1efdaacb475" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, - "rustaceanvim": { "branch": "master", "commit": "4ac7a3c6cca9e393229651cc90733afbdc7c6395" }, - "schemastore.nvim": { "branch": "main", "commit": "f922d46e17019e7fcadc1f0c1cfba31e8300819a" }, - "snacks.nvim": { "branch": "main", "commit": "67894ee778d567c8fb6f3e1e1774d1606d19ed27" }, + "rustaceanvim": { "branch": "master", "commit": "25aab238aad3e58f864274449456bdc339981750" }, + "schemastore.nvim": { "branch": "main", "commit": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df" }, + "snacks.nvim": { "branch": "main", "commit": "188b04370561470323ef20347c273105abd9b54d" }, "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, "statuscol.nvim": { "branch": "main", "commit": "8822f76e105549620ef9c0d96e7b95aedf14c490" }, "symbol-usage.nvim": { "branch": "main", "commit": "0f9b3da014b7e41559b643e7461fcabb2a7dc83a" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "872602fad676f735424341bb8e2064a191083423" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "a358728043a429d69ecfb317937df66f7cec40d5" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, "telescope-orgmode.nvim": { "branch": "main", "commit": "2cd2ea778726c6e44429fef82f23b63197dbce1b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope-undo.nvim": { "branch": "main", "commit": "2971cc9f193ec09e0c5de3563f99cbea16b63f10" }, @@ -129,17 +115,17 @@ "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, "venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" }, - "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" }, - "vim-dadbod-completion": { "branch": "master", "commit": "da0e75c09c27a82aad078d993bb1b2f4afd43427" }, - "vim-dadbod-ui": { "branch": "master", "commit": "7f89265a84fc003ccfa500fd99b9fea9db2c75c7" }, + "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" }, + "vim-dadbod-completion": { "branch": "master", "commit": "04485bfb53a629423233a4178d71cd4f8abf7406" }, + "vim-dadbod-ui": { "branch": "master", "commit": "0fec59e3e1e619e302198cd491b7d27f8d398b7c" }, "vim-move": { "branch": "master", "commit": "3c4195de0748da9bba25c54d78d959d349e93c55" }, "vim-nftables": { "branch": "master", "commit": "26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" }, "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, - "vimtex": { "branch": "master", "commit": "44a2f1203ce2b6fcf1ff2b03aeca52c45f8a157e" }, - "visual-whitespace.nvim": { "branch": "main", "commit": "76cffcf1523e8949c2cf9909915ec91e5d17972b" }, - "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" }, + "vimtex": { "branch": "master", "commit": "b8bb79b5fb27e9030ade92e75cd9375416f2c666" }, + "visual-whitespace.nvim": { "branch": "main", "commit": "31d0ed71ad7e376879d7e0df0c8cc4f1467702d4" }, + "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }, "window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, "z.nvim": { "branch": "main", "commit": "3e3a83e544925d938779366a11c65d11febf3f72" } } diff --git a/users/price/dots/.config/nvim/lua/plugins/configs/blink.lua b/users/price/dots/.config/nvim/lua/plugins/configs/blink.lua new file mode 100644 index 00000000..66c20579 --- /dev/null +++ b/users/price/dots/.config/nvim/lua/plugins/configs/blink.lua @@ -0,0 +1,167 @@ +return { + { + "folke/lazydev.nvim", + cmd = "LazyDev", + ft = "lua", + opts = { + library = { + { path = "luassert-types/library", words = { "assert" } }, + { path = "busted-types/library", words = { "describe" } }, + { path = "luvit-meta/library", words = { "vim%.uv", "vim%.loop" } }, + }, + }, + dependencies = { + { "Bilal2453/luvit-meta", lazy = true }, + { "LuaCATS/luassert", lazy = true }, + { "LuaCATS/busted", lazy = true }, + }, + }, + { + "saghen/blink.compat", + -- lazy.nvim will automatically load the plugin when it's required by blink.cmp + lazy = true, + -- make sure to set opts so that lazy.nvim calls blink.compat's setup + config = function() + require("blink.compat").setup({}) + end, + }, + { + "saghen/blink.cmp", + lazy = false, -- lazy loading handled internally + dependencies = { + "rafamadriz/friendly-snippets", + { + "L3MON4D3/LuaSnip", + build = "make install_jsregexp", + }, + "amarakon/nvim-cmp-lua-latex-symbols", + "mikavilpas/blink-ripgrep.nvim", + }, + build = "nix run .#build-plugin", + config = function() + ---@diagnostic disable-next-line: missing-fields + require("blink.cmp").setup({ + -- 'default' for mappings similar to built-in completion + -- 'super-tab' for mappings similar to vscode (tab to accept, arrow keys to navigate) + -- 'enter' for mappings similar to 'super-tab' but with 'enter' to accept + -- see the "default configuration" section below for full documentation on how to define + -- your own keymap. + keymap = { + preset = "default", + [""] = { "show", "show_documentation", "hide_documentation" }, + [""] = { "hide", "fallback" }, + [""] = { "accept", "fallback" }, + [""] = {}, + [""] = { + function(cmp) + if cmp.snippet_active() then + return cmp.accept() + else + return cmp.select_and_accept() + end + end, + "snippet_forward", + "fallback", + }, + [""] = { "snippet_backward", "fallback" }, + [""] = { "select_prev", "fallback" }, + [""] = { "select_next", "fallback" }, + [""] = { "select_next", "fallback" }, + [""] = { "select_prev", "fallback" }, + [""] = { "select_prev", "fallback" }, + [""] = { "select_next", "fallback" }, + ["\\"] = { + function(cmp) + cmp.show({ providers = { "lua-latex-symbols" } }) + end, + "fallback", + }, + [""] = { "scroll_documentation_up", "fallback" }, + [""] = { "scroll_documentation_down", "fallback" }, + }, + + ---@diagnostic disable-next-line: missing-fields + appearance = { + use_nvim_cmp_as_default = false, + -- Set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = "normal", + }, + + ---@diagnostic disable-next-line: missing-fields + sources = { + default = { + "lsp", + "path", + "snippets", + "buffer", + "ripgrep", + "dadbod", + "lua-latex-symbols", + }, + providers = { + ripgrep = { + module = "blink-ripgrep", + min_keyword_length = 3, + max_items = 5, + score_offset = 1, + name = "Ripgrep", + --- @module "blink-ripgrep" + --- @type blink-ripgrep.Options + opts = { + prefix_min_len = 3, + additional_rg_options = { + "--smart-case", + "--hidden", + "--word-regexp", + }, + }, + }, + ["lua-latex-symbols"] = { + name = "lua-latex-symbols", + module = "blink.compat.source", + max_items = 5, + opts = { + cache = true, + }, + score_offset = -3 + }, + dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" }, + }, + }, + + ---@diagnostic disable-next-line: missing-fields + completion = { + documentation = { + auto_show = true, + auto_show_delay_ms = 50 + }, + list = { + selection = "auto_insert", + }, + ghost_text = { + enabled = true, + }, + + ---@diagnostic disable-next-line: missing-fields + menu = { + draw = { + padding = 0, + columns = { + { "kind_icon" }, + { "label", "label_description", gap = 1 }, + }, + components = { + kind_icon = { + text = function(ctx) + return ctx.icon_gap .. ctx.kind_icon .. ctx.icon_gap + end, + }, + }, + }, + }, + }, + }) + end, + }, +} diff --git a/users/price/dots/.config/nvim/lua/plugins/configs/cmp.lua b/users/price/dots/.config/nvim/lua/plugins/configs/cmp.lua deleted file mode 100644 index df615045..00000000 --- a/users/price/dots/.config/nvim/lua/plugins/configs/cmp.lua +++ /dev/null @@ -1,370 +0,0 @@ ----@diagnostic disable: missing-fields -return { - { - "folke/lazydev.nvim", - cmd = "LazyDev", - ft = "lua", - opts = { - library = { - { path = "luassert-types/library", words = { "assert" } }, - { path = "busted-types/library", words = { "describe" } }, - { path = "luvit-meta/library", words = { "vim%.uv", "vim%.loop" } }, - }, - }, - dependencies = { - { "Bilal2453/luvit-meta", lazy = true }, - { "LuaCATS/luassert", lazy = true }, - { "LuaCATS/busted", lazy = true }, - }, - }, - { - "iguanacucumber/magazine.nvim", - name = "nvim-cmp", -- Otherwise highlighting gets messed up - event = { "InsertEnter", "ModeChanged" }, - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-cmdline", - "hrsh7th/cmp-emoji", - "amarakon/nvim-cmp-lua-latex-symbols", - { - "petertriho/cmp-git", - dependencies = { - "nvim-lua/plenary.nvim", - }, - opts = {}, - }, - "hrsh7th/cmp-nvim-lsp-signature-help", - "hrsh7th/cmp-calc", - "davidsierradz/cmp-conventionalcommits", - { - "tamago324/cmp-zsh", - opts = { - zshrc = true, - filetypes = { "*" }, - }, - }, - "David-Kunz/cmp-npm", - "lukas-reineke/cmp-rg", - "onsails/lspkind.nvim", - "FelipeLema/cmp-async-path", - { - "tzachar/cmp-fuzzy-buffer", - dependencies = { - "tzachar/fuzzy.nvim", - }, - }, - -- Snippets - { - "L3MON4D3/LuaSnip", - build = "make install_jsregexp", - dependencies = { - "rafamadriz/friendly-snippets", - "saadparwaiz1/cmp_luasnip", - }, - }, - }, - config = function() - local cmp = require("cmp") - local str = require("cmp.utils.str") - local compare = cmp.config.compare - local cmp_types = require("cmp.types") - local luasnip = require("luasnip") - - -- Load Snippets - require("luasnip.loaders.from_vscode").lazy_load() - require("luasnip.loaders.from_lua").load({ - paths = { vim.fn.stdpath("config") .. "/lua/plugins/snippets" }, - }) - - ---@param sources table? - local standard_sources = function(sources) - sources = sources or {} - local default_sources = { - { name = "async_path" }, - { name = "lazydev", group_index = 0 }, - { name = "nvim_lsp" }, - { "nvim_lsp_signature_help" }, - { name = "luasnip", max_item_count = 5 }, -- For luasnip users. - { name = "calc" }, - { name = "emoji", keyword_length = 2, max_item_count = 10 }, - { - name = "lua-latex-symbols", - option = { cache = true }, - max_item_count = 5, - trigger_characters = { "\\" }, - }, - { - name = "fuzzy_buffer", - max_item_count = 3, - }, - { - name = "rg", - keyword_length = 3, - max_item_count = 3, - option = { - "--smart-case", - "--hidden", - "--max-depth 4", - }, - }, - { name = "zsh", max_item_count = 3 }, - { name = "npm", keyword_length = 2 }, - } - - vim.tbl_map(function(source) - table.insert(default_sources, 1, source) - end, sources) - return cmp.config.sources(default_sources) - end - cmp.setup({ - formatting = { - fields = { cmp.ItemField.Kind, cmp.ItemField.Abbr, cmp.ItemField.Menu }, - ---@param entry cmp.Entry - ---@param vim_item vim.CompletedItem - format = function(entry, vim_item) - local selections = { - ["vim-dadbod-completion"] = { symbol = "󰆼 ", name = "DB", hl_group = "DadbodCompletion" }, - calc = { symbol = " ", name = "Calculator", hl_group = "Calculator" }, - orgmode = { symbol = " ", name = "Org", hl_group = "Orgmode" }, - emoji = { symbol = "󰞅 ", name = "Emoji", hl_group = "Emoji" }, - zsh = { symbol = " ", name = "Zsh", hl_group = "Zsh" }, - ["crates.nvim"] = { symbol = " ", name = "Crates", hl_group = "Crates" }, - cmdline_history = { symbol = " ", name = "Cmd History", hl_group = "CmdHistory" }, - rg = { symbol = " ", name = "Ripgrep", hl_group = "Ripgrep" }, - fuzzy_buffer = { symbol = "󰱼 ", name = "Buffer", hl_group = "Buffer" }, - npm = { symbol = " ", name = "Npm", hl_group = "Npm" }, - conventionalcommits = { symbol = " ", name = "Commit", hl_group = "Commit" }, - git = { symbol = "󰊢 ", name = "Git", hl_group = "Git" }, - docker_compose_language_service = { symbol = "󰡨 ", name = "Docker", hl_group = "Docker" }, - luasnip = { symbol = " ", name = "Snippet" }, - ["lua-latex-symbols"] = { symbol = "󰡱 ", name = "Math", hl_group = "LuaLatexSymbol" }, - } - - local extra_kind_icons = { - TypeParameter = "", - } - - local selection - local lsp_name - -- vim.notify(vim.inspect(entry.source)) - if entry.source.name == "nvim_lsp" then - lsp_name = entry.source.source.client.name - selection = selections[lsp_name] - else - selection = selections[entry.source.name] - end - local completion_item = vim_item - local abbr_max_width = 72 - if not selection then - local kind = require("lspkind").cmp_format({ - mode = "symbol_text", - maxwidth = abbr_max_width, - })(entry, vim_item) - - local strings = vim.split(kind.kind, "%s", { trimempty = true }) - if not strings[2] then - strings[2] = strings[1] - strings[1] = extra_kind_icons[strings[1]] or "" - end - kind.kind = " " .. strings[1] .. " " - if not kind.menu and lsp_name then - kind.menu = " " .. lsp_name - end - - completion_item = kind - else - completion_item.kind = " " .. selection.symbol - completion_item.menu = selection.symbol .. selection.name - if selection.hl_group then - completion_item.kind_hl_group = "CmpCustomSelection" .. selection.hl_group - end - end - - if not completion_item.abbr then - local word = entry:get_insert_text() - word = str.oneline(word) - completion_item.abbr = word - end - - --- If the completion item looks like a file path and exists, go ahead and - --- abbreviate it relative to the home directory - if - vim.fn.isdirectory(completion_item.abbr) == 1 - or vim.fn.filereadable(completion_item.abbr) == 1 - then - completion_item.abbr = vim.fn.fnamemodify(completion_item.abbr, ":~") - end - - if string.len(completion_item.abbr) >= abbr_max_width then - local before = string.sub(completion_item.abbr, 1, math.floor((abbr_max_width - 3) / 2)) - completion_item.abbr = before .. "..." - end - - -- concatenates the string - return completion_item - end, - }, - performance = { - debounce = 0, - fetching_timeout = 100, - }, - view = { - entries = { - name = "custom", - follow_cursor = true, - selection_order = "near_cursor", - }, - }, - matching = { - disallow_partial_fuzzy_matching = false, - disallow_fullfuzzy_matching = false, - disallow_partial_matching = false, - disallow_fuzzy_matching = false, - disallow_prefix_unmatching = false, - }, - window = { - documentation = { - side_padding = 0, - }, - completion = { - winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", - col_offset = -3, - side_padding = 0, - }, - }, - experimental = { ghost_text = { hl_group = "CmpGhostText" } }, - snippet = { - -- REQUIRED - you must specify a snippet engine - expand = function(args) - require("luasnip").lsp_expand(args.body) -- For `luasnip` users. - end, - }, - mapping = { - [""] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), - [""] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `` mapping. - [""] = cmp.mapping({ - i = cmp.mapping.abort(), - c = cmp.mapping.close(), - }), - [""] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - [""] = cmp.mapping(function(fallback) - if luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - else - fallback() - end - end, { "i", "s" }), - [""] = 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 = standard_sources(), - sorting = { - priority_weight = 2, - comparators = { - require("cmp_fuzzy_buffer.compare"), - compare.locality, - compare.offset, - compare.exact, - compare.score, - compare.recently_used, - compare.kind, - compare.length, - compare.order, - --- Copied from cmp-under-comparator - ---@param entry1 cmp.Entry - ---@param entry2 cmp.Entry - function(entry1, entry2) - local _, entry1_under = entry1.completion_item.label:find("^_+") - local _, entry2_under = entry2.completion_item.label:find("^_+") - entry1_under = entry1_under or 0 - entry2_under = entry2_under or 0 - if entry1_under > entry2_under then - return false - elseif entry1_under < entry2_under then - return true - end - end, - }, - }, - }) - - -- Git Commit Completions - cmp.setup.filetype("gitcommit", { - sources = standard_sources({ - { name = "git", priority = 20 }, - { name = "conventionalcommits", priority = 19 }, - }), - }) - - cmp.setup.filetype("octo", { - sources = standard_sources({ - { name = "git", priority = 20 }, - }), - }) - - cmp.setup.filetype( - "sql", - { sources = standard_sources({ { name = "vim-dadbod-completion", priority = 20 } }) } - ) - cmp.setup.filetype( - "mysql", - { sources = standard_sources({ { name = "vim-dadbod-completion", priority = 20 } }) } - ) - cmp.setup.filetype( - "plsql", - { sources = standard_sources({ { name = "vim-dadbod-completion", priority = 20 } }) } - ) - cmp.setup.filetype("org", { sources = standard_sources({ { name = "orgmode", priority = 20 } }) }) - - -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline("/", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ { name = "fuzzy_buffer" } }), - }) - - cmp.setup.cmdline("?", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ { name = "fuzzy_buffer" } }), - }) - - -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { - name = "cmdline", - option = { - ignore_cmds = { - "!", - }, - }, - priority = 100, - }, - }), - }) - end, - }, -} diff --git a/users/price/dots/.config/nvim/lua/plugins/configs/kanagawa.lua b/users/price/dots/.config/nvim/lua/plugins/configs/kanagawa.lua index 35ec3f8b..151aa1a6 100644 --- a/users/price/dots/.config/nvim/lua/plugins/configs/kanagawa.lua +++ b/users/price/dots/.config/nvim/lua/plugins/configs/kanagawa.lua @@ -109,35 +109,35 @@ return { -- Cmp { "CmpGhostText", { fg = colors.boatYellow1, italic = true } }, - { "CmpItemAbbrDeprecated", { fg = colors.fujiGray, bg = "NONE" } }, - { "CmpItemAbbrMatch", { fg = colors.crystalBlue, bg = "NONE" } }, - { "CmpItemAbbrMatchFuzzy", { fg = colors.crystalBlue, bg = "NONE" } }, - { "CmpItemMenu", { fg = colors.roninYellow, bg = "NONE" } }, - { "CmpItemKindField", { fg = colors.fujiWhite, bg = colors.sakuraPink, blend = 0 } }, - { "CmpItemKindProperty", { fg = colors.fujiWhite, bg = colors.sakuraPink, blend = 0 } }, - { "CmpItemKindEvent", { fg = colors.fujiWhite, bg = colors.sakuraPink, blend = 0 } }, - { "CmpItemKindText", { fg = colors.fujiWhite, bg = colors.dragonBlue, blend = 0 } }, - { "CmpItemKindEnum", { fg = colors.fujiWhite, bg = colors.crystalBlue, blend = 0 } }, - { "CmpItemKindKeyword", { fg = colors.fujiWhite, bg = colors.surimiOrange, blend = 0 } }, - { "CmpItemKindConstant", { fg = colors.fujiWhite, bg = colors.crystalBlue, blend = 0 } }, - { "CmpItemKindConstructor", { fg = colors.fujiWhite, bg = colors.crystalBlue, blend = 0 } }, - { "CmpItemKindReference", { fg = colors.fujiWhite, bg = colors.crystalBlue, blend = 0 } }, - { "CmpItemKindFunction", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, - { "CmpItemKindStruct", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, - { "CmpItemKindClass", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, - { "CmpItemKindModule", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, - { "CmpItemKindOperator", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, - { "CmpItemKindVariable", { fg = colors.fujiWhite, bg = colors.peachRed, blend = 0 } }, - { "CmpItemKindFile", { fg = colors.fujiWhite, bg = colors.autumnYellow, blend = 0 } }, - { "CmpItemKindUnit", { fg = colors.fujiWhite, bg = colors.autumnYellow, blend = 0 } }, - { "CmpItemKindSnippet", { fg = colors.fujiWhite, bg = colors.autumnYellow, blend = 0 } }, - { "CmpItemKindFolder", { fg = colors.fujiWhite, bg = colors.autumnYellow, blend = 0 } }, - { "CmpItemKindMethod", { fg = colors.fujiWhite, bg = colors.autumnGreen, blend = 0 } }, - { "CmpItemKindValue", { fg = colors.fujiWhite, bg = colors.autumnGreen, blend = 0 } }, - { "CmpItemKindEnumMember", { fg = colors.fujiWhite, bg = colors.autumnGreen, blend = 0 } }, - { "CmpItemKindInterface", { fg = colors.fujiWhite, bg = colors.waveRed, blend = 0 } }, - { "CmpItemKindColor", { fg = colors.fujiWhite, bg = colors.waveAqua2, blend = 0 } }, - { "CmpItemKindTypeParameter", { fg = colors.fujiWhite, bg = colors.waveAqua2, blend = 0 } }, + { "BlinkCmpAbbrDeprecated", { fg = colors.fujiGray, bg = "NONE" } }, + { "BlinkCmpAbbrMatch", { fg = colors.crystalBlue, bg = "NONE" } }, + { "BlinkCmpAbbrMatchFuzzy", { fg = colors.crystalBlue, bg = "NONE" } }, + { "BlinkCmpMenu", { fg = colors.roninYellow, bg = "NONE" } }, + { "BlinkCmpKindField", { fg = colors.fujiWhite, bg = colors.sakuraPink, blend = 0 } }, + { "BlinkCmpKindProperty", { fg = colors.fujiWhite, bg = colors.sakuraPink, blend = 0 } }, + { "BlinkCmpKindEvent", { fg = colors.fujiWhite, bg = colors.sakuraPink, blend = 0 } }, + { "BlinkCmpKindText", { fg = colors.fujiWhite, bg = colors.dragonBlue, blend = 0 } }, + { "BlinkCmpKindEnum", { fg = colors.fujiWhite, bg = colors.crystalBlue, blend = 0 } }, + { "BlinkCmpKindKeyword", { fg = colors.fujiWhite, bg = colors.surimiOrange, blend = 0 } }, + { "BlinkCmpKindConstant", { fg = colors.fujiWhite, bg = colors.crystalBlue, blend = 0 } }, + { "BlinkCmpKindConstructor", { fg = colors.fujiWhite, bg = colors.crystalBlue, blend = 0 } }, + { "BlinkCmpKindReference", { fg = colors.fujiWhite, bg = colors.crystalBlue, blend = 0 } }, + { "BlinkCmpKindFunction", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, + { "BlinkCmpKindStruct", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, + { "BlinkCmpKindClass", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, + { "BlinkCmpKindModule", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, + { "BlinkCmpKindOperator", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, + { "BlinkCmpKindVariable", { fg = colors.fujiWhite, bg = colors.peachRed, blend = 0 } }, + { "BlinkCmpKindFile", { fg = colors.fujiWhite, bg = colors.autumnYellow, blend = 0 } }, + { "BlinkCmpKindUnit", { fg = colors.fujiWhite, bg = colors.autumnYellow, blend = 0 } }, + { "BlinkCmpKindSnippet", { fg = colors.fujiWhite, bg = colors.autumnYellow, blend = 0 } }, + { "BlinkCmpKindFolder", { fg = colors.fujiWhite, bg = colors.autumnYellow, blend = 0 } }, + { "BlinkCmpKindMethod", { fg = colors.fujiWhite, bg = colors.autumnGreen, blend = 0 } }, + { "BlinkCmpKindValue", { fg = colors.fujiWhite, bg = colors.autumnGreen, blend = 0 } }, + { "BlinkCmpKindEnumMember", { fg = colors.fujiWhite, bg = colors.autumnGreen, blend = 0 } }, + { "BlinkCmpKindInterface", { fg = colors.fujiWhite, bg = colors.waveRed, blend = 0 } }, + { "BlinkCmpKindColor", { fg = colors.fujiWhite, bg = colors.waveAqua2, blend = 0 } }, + { "BlinkCmpKindTypeParameter", { fg = colors.fujiWhite, bg = colors.waveAqua2, blend = 0 } }, { "CmpCustomSelectionColor", { bg = colors.sumiInk5, blend = 0 } }, { "CmpCustomSelectionDadbodCompletion", { fg = colors.fujiWhite, bg = colors.oniViolet, blend = 0 } }, { "CmpCustomSelectionGit", { fg = colors.fujiWhite, bg = colors.roninYellow, blend = 0 } }, diff --git a/users/price/dots/.config/nvim/lua/plugins/configs/lsp.lua b/users/price/dots/.config/nvim/lua/plugins/configs/lsp.lua index 738ca779..73ae26b2 100644 --- a/users/price/dots/.config/nvim/lua/plugins/configs/lsp.lua +++ b/users/price/dots/.config/nvim/lua/plugins/configs/lsp.lua @@ -275,7 +275,7 @@ return { event = { "BufReadPre", "BufNewFile" }, config = function() local lsp_capabilities = - require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) + require("blink.cmp").get_lsp_capabilities() local db_timer = vim.uv.new_timer() vim.api.nvim_create_autocmd("LspAttach", { callback = function(args)