diff --git a/modules/default.nix b/modules/default.nix index a479bae2..8b157bb2 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,7 @@ { self, inputs, - lib, + ... }: { pkgs, extraSpecialArgs ? {}, @@ -10,17 +10,20 @@ extraModules ? [], configuration ? {}, }: let + inherit (pkgs) lib; + inherit (lib.modules) evalModules; inherit (lib.strings) toString; - inherit (lib.lists) concatLists; + inherit (lib.trivial) warn; + inherit (lib.lists) concatLists optional optionals; - # import modules.nix with `check`, `pkgs` and `lib` as arguments + # import modules.nix with `check` and `pkgs` as arguments # check can be disabled while calling this file is called # to avoid checking in all modules - nvimModules = import ./modules.nix {inherit pkgs lib;}; + nvimModules = import ./modules.nix {inherit pkgs;}; # evaluate the extended library with the modules # optionally with any additional modules passed by the user - module = lib.evalModules { + module = evalModules { specialArgs = extraSpecialArgs // { @@ -30,12 +33,12 @@ modules = concatLists [ nvimModules modules - (lib.optional (configuration != {}) (lib.warn '' + (optional (configuration != {}) (warn '' nvf: passing 'configuration' to lib.neovimConfiguration is deprecated. '' configuration)) - (lib.optionals (extraModules != []) (lib.warn '' + (optionals (extraModules != []) (warn '' nvf: passing 'extraModules' to lib.neovimConfiguration is deprecated, use 'modules' instead. '' extraModules))