From 815a0998053da70d72e9ba017a05e8ecb9dbd952 Mon Sep 17 00:00:00 2001 From: LeMarsu Date: Sun, 9 Jun 2024 23:26:50 +0200 Subject: [PATCH] feat: runtime is now optional as it should be according to docs... --- lib/mkNeovimPkg.nix | 13 ++++++++++--- lib/types.nix | 6 +++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/mkNeovimPkg.nix b/lib/mkNeovimPkg.nix index 2e55ea3..9dd0ed7 100644 --- a/lib/mkNeovimPkg.nix +++ b/lib/mkNeovimPkg.nix @@ -6,7 +6,7 @@ package ? pkgs.neovim-unwrapped, dependencies ? [], dependenciesExtraArgs ? {}, - runtime ? {}, + runtime ? null, viAlias ? false, vimAlias ? false, vimdiffAlias ? false, @@ -16,6 +16,7 @@ inherit (builtins) map; inherit (pkgs) callPackage bash lib; inherit (lib.strings) optionalString; + inherit (lib.lists) optional; inherit (lib.trivial) flip; # inherit (lib.lists) concatMap filter foldl' map optional reverseList; # inherit (lib.attrsets) attrNames optionalAttrs; @@ -29,13 +30,19 @@ runtimePlugin = deps.mkRuntimePlugin runtime; plugins = normalizedPlugins - ++ (deps.normalizePlugins [runtimePlugin sloth-flake]); + ++ ( + deps.normalizePlugins + ([sloth-flake] ++ (optional (runtime != null) runtimePlugin)) + ); extractPlugin = p: {inherit (p) optional plugin;}; extractPlugins = map extractPlugin; customRC = let - rc = ({init ? ../lua/default_init.lua, ...}: init) runtime; + rc = + if isNull runtime || isNull runtime.init + then ../lua/default_init.lua + else runtime.init; in deps.textOrContent rc; diff --git a/lib/types.nix b/lib/types.nix index e0d262c..2b61502 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -99,13 +99,13 @@ in rec { package = option drv; # An array of dependencies. - dependencies = list dependency; + dependencies = option (list dependency); # Extra argument to pass to dependencies files - dependenciesExtraArgs = attrs any; + dependenciesExtraArgs = option (attrs any); # Runtime configuration - runtime = runtimeType; + runtime = option runtimeType; # Create a vi alias viAlias = option bool;