nixvimConfigs/fiesta/setups/completion: refactor

This commit is contained in:
Gabriel Arazas 2024-02-12 17:42:58 +08:00
parent d8597b8aab
commit e397da0add
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, helpers, ... }:
let let
nixvimCfg = config.nixvimConfigs.fiesta; nixvimCfg = config.nixvimConfigs.fiesta;
@ -16,7 +16,7 @@ in
mapping = { mapping = {
"<CR>" = "cmp.mapping.confirm({ select = true })"; "<CR>" = "cmp.mapping.confirm({ select = true })";
"<C-Space" = "cmp.mapping.complete()"; "<C-Space>" = "cmp.mapping.complete()";
"<C-d>" = "cmp.mapping.scroll_docs(-4)"; "<C-d>" = "cmp.mapping.scroll_docs(-4)";
"<C-u>" = "cmp.mapping.scroll_docs(4)"; "<C-u>" = "cmp.mapping.scroll_docs(4)";
"<C-g>" = "cmp.mapping.close()"; "<C-g>" = "cmp.mapping.close()";
@ -70,7 +70,7 @@ in
}) })
(lib.mkIf nixvimCfg.setups.snippets.enable { (lib.mkIf nixvimCfg.setups.snippets.enable {
plugins.nvim-cmp.extraOptions.snippet.expand.__raw = '' plugins.nvim-cmp.extraOptions.snippet.expand = helpers.mkRaw ''
function(args) function(args)
require('luasnip').lsp_expand(args.body) require('luasnip').lsp_expand(args.body)
end end
@ -80,14 +80,12 @@ in
name = "luasnip"; name = "luasnip";
groupIndex = 2; groupIndex = 2;
}]; }];
plugins.cmp_luasnip.enable = true;
}) })
(lib.mkIf nixvimCfg.setups.treesitter.enable { (lib.mkIf nixvimCfg.setups.treesitter.enable {
plugins.cmp-treesitter.enable = true; plugins.cmp-treesitter.enable = true;
}) })
(lib.mkIf nixvimCfg.setups.snippets.enable {
plugins.cmp_luasnip.enable = true;
})
]); ]);
} }