fix: no more calling deprecated function `makeNeovimConfig`

dev
LeMarsu 2026-04-17 15:51:11 +02:00
parent 24b7227e6f
commit 84305d33fd
1 changed files with 20 additions and 4 deletions

View File

@ -50,18 +50,34 @@ in {
...
}: let
pkg = pkgs.wrapNeovimUnstable config.package config.neovimOptions;
luaRcContent = config.init.finalContent;
inherit (config) extraLuaPackages;
neovim-unwrapped = config.package;
inherit (neovim-unwrapped.lua.pkgs.luaLib) genLuaPathAbsStr genLuaCPathAbsStr;
luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages;
neovimOptions = pkgs.neovimUtils.makeNeovimConfig rec {
inherit (config) extraLuaPackages viAlias vimAlias;
neovimOptions = {
inherit extraLuaPackages luaRcContent;
inherit (config) viAlias vimAlias;
customLuaRC = config.init.finalContent;
wrapRc = customLuaRC != null;
wrapRc = luaRcContent != null;
plugins = concatLists [
(map modules.plugin.extract config.plugins)
(optional (! isNull config.runtime) config.runtime.package)
[config.slothPlugin]
];
wrapperArgs = lib.optionals (luaEnv != null) [
"--prefix"
"LUA_PATH"
";"
(genLuaPathAbsStr luaEnv)
"--prefix"
"LUA_CPATH"
";"
(genLuaCPathAbsStr luaEnv)
];
};
neovimPackage = pkg.overrideAttrs (final: super: {