nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

neovim: add missing bit for extraLuaPackages

Browse source 
turns out I forgot to remove the now unnecessary wrapper arguments in
https://github.com/nix-community/home-manager/pull/8606.
This meant that `xdg.configFile."nvim/init.lua".enable = false` was
enough to fix the user issues but this should not be the case anymore.
This commit is contained in:
teto 2026-01-25 19:15:19 +01:00 • committed by Matthieu Coudron
parent 2a08ab21ab
commit 5786e42530
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/programs/neovim.nix
View file

@ -7,7 +7,6 @@
let
inherit (lib)
concatMapStringsSep
literalExpression
mkEnableOption
mkIf
@ -428,20 +427,6 @@ in
(lib.makeBinPath cfg.extraPackages)
];
extraMakeWrapperLuaCArgs = optionals (resolvedExtraLuaPackages != [ ]) [
"--suffix"
"LUA_CPATH"
";"
(concatMapStringsSep ";" luaPackages.getLuaCPath resolvedExtraLuaPackages)
];
extraMakeWrapperLuaArgs = optionals (resolvedExtraLuaPackages != [ ]) [
"--suffix"
"LUA_PATH"
";"
(concatMapStringsSep ";" luaPackages.getLuaPath resolvedExtraLuaPackages)
];
vimPackageInfo = neovimUtils.makeVimPackageInfo (map suppressNotVimlConfig pluginsNormalized);
wrappedNeovim' = pkgs.wrapNeovimUnstable cfg.package {
@ -462,8 +447,7 @@ in
extraPython3Packages =
ps: (cfg.extraPython3Packages ps) ++ (lib.concatMap (f: f ps) vimPackageInfo.pluginPython3Packages);
neovimRcContent = cfg.extraConfig;
wrapperArgs =
cfg.extraWrapperArgs ++ extraMakeWrapperArgs ++ extraMakeWrapperLuaCArgs ++ extraMakeWrapperLuaArgs;
wrapperArgs = cfg.extraWrapperArgs ++ extraMakeWrapperArgs;
wrapRc = false;
};
in