mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

(hopefully) fix #65

Browse source
This commit is contained in:
Pedro Alves 2022-11-08 11:19:38 +00:00
parent 03a80e3da1
commit 1a89cd2107
3 changed files with 108 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
modules/output.nix
View file

@ -87,19 +87,6 @@ in
config =
let
customRC =
(optionalString (config.extraConfigLuaPre != "") ''
${config.extraConfigLuaPre}
'') +
(optionalString (config.extraConfigVim != "") ''
vim.cmd([[
${config.extraConfigVim}
]])
'') +
(optionalString (config.extraConfigLua != "" || config.extraConfigLuaPost != "") ''
${config.extraConfigLua}
${config.extraConfigLuaPost}
'');
defaultPlugin = {
plugin = null;
@ -121,6 +108,25 @@ in
{ nixvim = { start = map (x: x.plugin) normalizedPlugins; opt = [ ]; }; };
});
customRC =
''
vim.cmd([[
${neovimConfig.neovimRcContent}
]])
'' +
(optionalString (config.extraConfigLuaPre != "") ''
${config.extraConfigLuaPre}
'') +
(optionalString (config.extraConfigVim != "") ''
vim.cmd([[
${config.extraConfigVim}
]])
'') +
(optionalString (config.extraConfigLua != "" || config.extraConfigLuaPost != "") ''
${config.extraConfigLua}
${config.extraConfigLuaPost}
'');
extraWrapperArgs = builtins.concatStringsSep " " (
(optional (config.extraPackages != [ ])
''--prefix PATH : "${makeBinPath config.extraPackages}"'')
@ -136,6 +142,6 @@ in
in
{
finalPackage = wrappedNeovim;
initContent = neovimConfig.neovimRcContent;
initContent = customRC;
};
}