modules: refactor plugins code in top-level

This commit is contained in:
Gaetan Lepage 2025-03-31 23:47:06 +02:00
parent d81f37256d
commit efb24d78bd
7 changed files with 221 additions and 122 deletions

View file

@ -171,126 +171,6 @@ in
config =
let
# Plugin normalization
normalize =
p:
let
defaultPlugin = {
plugin = null;
config = null;
optional = false;
};
in
defaultPlugin // (if p ? plugin then p else { plugin = p; });
normalizePluginList = plugins: map normalize plugins;
# Byte compiling of normalized plugin list
byteCompilePlugins =
plugins:
let
byteCompile =
p:
(builders.byteCompileLuaDrv p).overrideAttrs (
prev: lib.optionalAttrs (prev ? dependencies) { dependencies = map byteCompile prev.dependencies; }
);
in
map (p: p // { plugin = byteCompile p.plugin; }) plugins;
# Normalized and optionally byte compiled plugin list
normalizedPlugins =
let
normalized = normalizePluginList config.extraPlugins;
in
if config.performance.byteCompileLua.enable && config.performance.byteCompileLua.plugins then
byteCompilePlugins normalized
else
normalized;
# Plugin list extended with dependencies
allPlugins =
let
pluginWithItsDeps =
p: [ p ] ++ builtins.concatMap pluginWithItsDeps (normalizePluginList p.plugin.dependencies or [ ]);
in
lib.unique (builtins.concatMap pluginWithItsDeps normalizedPlugins);
# Remove dependencies from all plugins in a list
removeDependencies = ps: map (p: p // { plugin = removeAttrs p.plugin [ "dependencies" ]; }) ps;
# Separated start and opt plugins
partitionedOptStartPlugins = builtins.partition (p: p.optional) allPlugins;
startPlugins = partitionedOptStartPlugins.wrong;
# Remove opt plugin dependencies since they are already available in start plugins
optPlugins = removeDependencies partitionedOptStartPlugins.right;
# Test if plugin shouldn't be included in plugin pack
isStandalone =
p:
builtins.elem p.plugin config.performance.combinePlugins.standalonePlugins
|| builtins.elem (lib.getName p.plugin) config.performance.combinePlugins.standalonePlugins;
# Separated standalone and combined start plugins
partitionedStandaloneStartPlugins = builtins.partition isStandalone startPlugins;
toCombinePlugins = partitionedStandaloneStartPlugins.wrong;
# Remove standalone plugin dependencies since they are already available in start plugins
standaloneStartPlugins = removeDependencies partitionedStandaloneStartPlugins.right;
# Combine start plugins into a single pack
pluginPack =
let
# Every plugin has its own generated help tags (doc/tags)
# Remove them to avoid collisions, new help tags
# will be generate for the entire pack later on
overriddenPlugins = map (
plugin:
plugin.plugin.overrideAttrs (prev: {
nativeBuildInputs = lib.remove pkgs.vimUtils.vimGenDocHook prev.nativeBuildInputs or [ ];
configurePhase = ''
${prev.configurePhase or ""}
rm -vf doc/tags'';
})
) toCombinePlugins;
# Python3 dependencies
python3Dependencies =
let
deps = map (p: p.plugin.python3Dependencies or (_: [ ])) toCombinePlugins;
in
ps: builtins.concatMap (f: f ps) deps;
# Combined plugin
combinedPlugin = pkgs.vimUtils.toVimPlugin (
pkgs.buildEnv {
name = "plugin-pack";
paths = overriddenPlugins;
inherit (config.performance.combinePlugins) pathsToLink;
# Remove empty directories and activate vimGenDocHook
postBuild = ''
find $out -type d -empty -delete
runHook preFixup
'';
passthru = {
inherit python3Dependencies;
};
}
);
# Combined plugin configs
combinedConfig = builtins.concatStringsSep "\n" (
builtins.concatMap (x: lib.optional (x.config != null && x.config != "") x.config) toCombinePlugins
);
in
normalize {
plugin = combinedPlugin;
config = combinedConfig;
};
# Combined plugins
combinedPlugins = [ pluginPack ] ++ standaloneStartPlugins ++ optPlugins;
# Plugins to use in build.package
plugins = if config.performance.combinePlugins.enable then combinedPlugins else normalizedPlugins;
neovimConfig = pkgs.neovimUtils.makeNeovimConfig (
{
inherit (config)
@ -304,7 +184,7 @@ in
withPython3
;
# inherit customRC;
inherit plugins;
inherit (config.build) plugins;
}
# Necessary to make sure the runtime path is set properly in NixOS 22.05,
# or more generally before the commit:
@ -312,7 +192,7 @@ in
// optionalAttrs (lib.functionArgs pkgs.neovimUtils.makeNeovimConfig ? configure) {
configure.packages = {
nixvim = {
start = map (x: x.plugin) plugins;
start = map (x: x.plugin) config.build.plugins;
opt = [ ];
};
};