refactor: simplify configuration creation
parent
99b4355a1a
commit
27c8d275c5
|
|
@ -86,18 +86,20 @@
|
||||||
then deps.textOrContent init
|
then deps.textOrContent init
|
||||||
else buildInit (optionalAttrs (! isNull init) init);
|
else buildInit (optionalAttrs (! isNull init) init);
|
||||||
|
|
||||||
neovimConfig =
|
neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
|
||||||
pkgs.neovimUtils.makeNeovimConfig {
|
# inherit customRC;
|
||||||
inherit customRC;
|
customLuaRC = customRC;
|
||||||
plugins = extractPlugins plugins;
|
plugins = extractPlugins plugins;
|
||||||
extraLuaPackages = ps:
|
extraLuaPackages = ps:
|
||||||
(extractLuaPackagesFn plugins ps) ++ (extraLuaPackages ps);
|
(extractLuaPackagesFn plugins ps) ++ (extraLuaPackages ps);
|
||||||
}
|
inherit viAlias vimAlias;
|
||||||
// {luaRcContent = customRC;};
|
# autoconfigure = false;
|
||||||
params =
|
};
|
||||||
removeAttrs neovimConfig ["manifestRc" "neovimRcContent"]
|
# // {luaRcContent = customRC;};
|
||||||
// {inherit viAlias vimAlias;};
|
# params =
|
||||||
pkg = pkgs.wrapNeovimUnstable package params;
|
# removeAttrs neovimConfig ["neovimRcContent"]
|
||||||
|
# // {inherit viAlias vimAlias;};
|
||||||
|
pkg = pkgs.wrapNeovimUnstable package neovimConfig;
|
||||||
mkDiffAlias = name:
|
mkDiffAlias = name:
|
||||||
(flip optionalString) ''
|
(flip optionalString) ''
|
||||||
cat <<SH > $out/bin/${name}
|
cat <<SH > $out/bin/${name}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue