Skip to content

Commit 4473f5c

Browse files
committed
refactor pluginToLua (will be squashed after pr review if deemed appropriate)
1 parent 2589416 commit 4473f5c

File tree

1 file changed

+15
-43
lines changed

1 file changed

+15
-43
lines changed

plugins/pluginmanagers/lazy.nix

Lines changed: 15 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -167,49 +167,21 @@ nixvim.neovim-plugin.mkNeovimPlugin config {
167167

168168
pluginToLua =
169169
plugin:
170-
let
171-
keyExists = keyToCheck: attrSet: lib.elem keyToCheck (lib.attrNames attrSet);
172-
converted =
173-
if isDerivation plugin then
174-
{ dir = "${lazyPath}/${lib.getName plugin}"; }
175-
else
176-
let
177-
handledPluginOptions = {
178-
"__unkeyed" = plugin.name;
179-
180-
inherit (plugin)
181-
cmd
182-
cond
183-
config
184-
dev
185-
enabled
186-
event
187-
ft
188-
init
189-
keys
190-
lazy
191-
main
192-
module
193-
name
194-
optional
195-
opts
196-
priority
197-
submodules
198-
;
199-
200-
dependencies = helpers.ifNonNull' plugin.dependencies (
201-
if isList plugin.dependencies then (pluginListToLua plugin.dependencies) else plugin.dependencies
202-
);
203-
204-
dir =
205-
if plugin ? dir && plugin.dir != null then plugin.dir else "${lazyPath}/${lib.getName plugin.pkg}";
206-
};
207-
freeformPluginOptions = lib.removeAttrs plugin ((lib.attrNames handledPluginOptions) ++ [ "pkg" ]);
208-
combinedPluginOptions = freeformPluginOptions // handledPluginOptions;
209-
in
210-
combinedPluginOptions;
211-
in
212-
converted;
170+
if isDerivation plugin then
171+
{ dir = "${lazyPath}/${lib.getName plugin}"; }
172+
else
173+
plugin
174+
// {
175+
"__unkeyed" = plugin.name;
176+
dir =
177+
if plugin ? dir && plugin.dir != null then plugin.dir else "${lazyPath}/${lib.getName plugin.pkg}";
178+
dependencies = helpers.ifNonNull' plugin.dependencies (
179+
if isList plugin.dependencies then (pluginListToLua plugin.dependencies) else plugin.dependencies
180+
);
181+
}
182+
// {
183+
pkg = null;
184+
};
213185

214186
pluginListToLua = map pluginToLua;
215187

0 commit comments

Comments
 (0)