|
62 | 62 | {
|
63 | 63 | performance.combinePlugins.enable = true;
|
64 | 64 | extraPlugins = with pkgs.vimPlugins; [
|
65 |
| - # Depends on nvim-cmp |
66 |
| - cmp-dictionary |
67 |
| - # Depends on telescope-nvim which itself depends on plenary-nvim |
68 |
| - telescope-undo-nvim |
| 65 | + # Depends on nui-nvim |
| 66 | + noice-nvim |
| 67 | + # Depends on null-ls-nvim which itself depends on plenary-nvim |
| 68 | + mason-null-ls-nvim |
69 | 69 | ];
|
70 | 70 | extraConfigLuaPost = ''
|
71 | 71 | -- Plugins and its dependencies are loadable
|
72 |
| - require("cmp_dictionary") |
73 |
| - require("cmp") |
74 |
| - require("telescope-undo") |
75 |
| - require("telescope") |
| 72 | + require("noice") |
| 73 | + require("nui.popup") |
| 74 | + require("mason-null-ls.settings") -- Avoid calling deprecated functions |
| 75 | + require("null-ls.helpers") -- Avoid calling deprecated functions |
76 | 76 | require("plenary")
|
77 | 77 | '';
|
78 | 78 | assertions = [
|
|
155 | 155 | # Optional plugin with dependency on plenary-nvim
|
156 | 156 | # Dependencies should not be duplicated
|
157 | 157 | {
|
158 |
| - plugin = telescope-nvim; |
| 158 | + plugin = none-ls-nvim; |
159 | 159 | optional = true;
|
160 | 160 | }
|
161 | 161 | ];
|
|
167 | 167 | -- Opt plugins are not loadable
|
168 | 168 | local ok = pcall(require, "nvim-treesitter")
|
169 | 169 | assert(not ok, "nvim-treesitter plugin is loadable")
|
170 |
| - ok = pcall(require, "telescope") |
171 |
| - assert(not ok, "telescope-nvim plugin is loadable") |
| 170 | + ok = pcall(require, "null-ls") |
| 171 | + assert(not ok, "null-ls-nvim plugin is loadable") |
172 | 172 |
|
173 | 173 | -- Load plugins
|
174 | 174 | vim.cmd.packadd("nvim-treesitter")
|
175 |
| - vim.cmd.packadd("telescope.nvim") |
| 175 | + vim.cmd.packadd("none-ls.nvim") |
176 | 176 |
|
177 | 177 | -- Now opt plugins are loadable
|
178 | 178 | require("nvim-treesitter")
|
179 |
| - require("telescope") |
| 179 | + require("null-ls") |
180 | 180 |
|
181 | 181 | -- Only one copy of plenary-nvim should be available
|
182 | 182 | assert(
|
|
321 | 321 | # By package itself
|
322 | 322 | nvim-lspconfig
|
323 | 323 | # Its dependency, plenary-nvim, not in this list, so will be combined
|
324 |
| - telescope-nvim |
| 324 | + none-ls-nvim |
325 | 325 | # Dependency of other plugin
|
326 |
| - "nvim-cmp" |
| 326 | + "nui.nvim" |
327 | 327 | ];
|
328 | 328 | };
|
329 | 329 | extraPlugins = with pkgs.vimPlugins; [
|
330 | 330 | nvim-treesitter
|
331 | 331 | nvim-lspconfig
|
332 |
| - telescope-nvim |
333 |
| - # Only its dependency (nvim-cmp) won't be combined, but not the plugin itself |
334 |
| - cmp-dictionary |
| 332 | + none-ls-nvim |
| 333 | + # Only its dependency (nui-nvim) won't be combined, but not the plugin itself |
| 334 | + noice-nvim |
335 | 335 | # More plugins
|
336 | 336 | gitsigns-nvim
|
337 | 337 | luasnip
|
|
340 | 340 | -- Plugins are loadable
|
341 | 341 | require("nvim-treesitter")
|
342 | 342 | require("lspconfig")
|
343 |
| - require("telescope") |
| 343 | + require("null-ls") |
344 | 344 | require("plenary")
|
345 |
| - require("cmp_dictionary") |
346 |
| - require("cmp") |
| 345 | + require("noice") |
| 346 | + require("nui.popup") |
347 | 347 | require("gitsigns")
|
348 | 348 | require("luasnip")
|
349 | 349 |
|
|
357 | 357 | -- Standalone plugins
|
358 | 358 | assert(is_standalone("nvim-treesitter"), "nvim-treesitter is combined, expected standalone")
|
359 | 359 | assert(is_standalone("lspconfig"), "nvim-lspconfig is combined, expected standalone")
|
360 |
| - assert(is_standalone("telescope"), "telescope-nvim is combined, expected standalone") |
361 |
| - -- Add trailing slash to ensure that it doesn't match cmp_dictionary |
362 |
| - assert(is_standalone("cmp/", "nvim-cmp"), "nvim-cmp is combined, expected standalone") |
| 360 | + assert(is_standalone("null-ls", "none-ls.nvim"), "none-ls-nvim is combined, expected standalone") |
| 361 | + assert(is_standalone("nui"), "nui-nvim is combined, expected standalone") |
363 | 362 | -- Combined plugins
|
364 | 363 | assert(not is_standalone("plenary"), "plenary-nvim is standalone, expected combined")
|
365 |
| - assert(not is_standalone("cmp_dictionary", "cmp-dictionary"), "cmp-dictionary is standalone, expected combined") |
| 364 | + assert(not is_standalone("noice"), "noice-nvim is standalone, expected combined") |
366 | 365 | assert(not is_standalone("gitsigns"), "gitsigns-nvim is standalone, expected combined")
|
367 | 366 | assert(not is_standalone("luasnip"), "luasnip is standalone, expected combined")
|
368 | 367 | '';
|
369 | 368 | assertions = [
|
370 | 369 | {
|
371 |
| - # plugin-pack, nvim-treesitter, nvim-lspconfig, telescope-nvim, nvim-cmp |
| 370 | + # plugin-pack, nvim-treesitter, nvim-lspconfig, none-ls-nvim, nui-nvim |
372 | 371 | assertion = pluginCount config.build.nvimPackage config.build.extraFiles "start" == 5;
|
373 | 372 | message = "Wrong number of plugins in packpathDirs";
|
374 | 373 | }
|
|
0 commit comments