lib/modules: init with specialArgs helpers

This commit is contained in:
Matt Sturgeon 2024-08-02 01:26:01 +01:00
parent 491ca5cf51
commit 27c4c9c210
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
9 changed files with 35 additions and 49 deletions

View file

@ -23,12 +23,7 @@ in
default = { };
type = types.submoduleWith {
shorthandOnlyDefinesConfig = true;
specialArgs = {
darwinConfig = config;
defaultPkgs = pkgs;
helpers = config.lib.nixvim;
lib = config.lib.nixvim.extendedLib;
};
specialArgs = config.lib.nixvim.modules.specialArgsWith { darwinConfig = config; };
modules = [
./modules/darwin.nix
../modules/top-level

View file

@ -22,12 +22,7 @@ in
default = { };
type = types.submoduleWith {
shorthandOnlyDefinesConfig = true;
specialArgs = {
hmConfig = config;
defaultPkgs = pkgs;
helpers = config.lib.nixvim;
lib = config.lib.nixvim.extendedLib;
};
specialArgs = config.lib.nixvim.modules.specialArgsWith { hmConfig = config; };
modules = [
./modules/hm.nix
../modules/top-level

View file

@ -23,12 +23,7 @@ in
default = { };
type = types.submoduleWith {
shorthandOnlyDefinesConfig = true;
specialArgs = {
nixosConfig = config;
defaultPkgs = pkgs;
helpers = config.lib.nixvim;
lib = config.lib.nixvim.extendedLib;
};
specialArgs = config.lib.nixvim.modules.specialArgsWith { nixosConfig = config; };
modules = [
./modules/nixos.nix
../modules/top-level

View file

@ -1,15 +1,16 @@
default_pkgs: self:
{
pkgs ? default_pkgs,
lib ? pkgs.lib,
extraSpecialArgs ? { },
_nixvimTests ? false,
module,
}:
let
inherit (pkgs) lib;
helpers = import ../lib/helpers.nix { inherit pkgs lib _nixvimTests; };
inherit (helpers.modules) specialArgsWith;
handleAssertions =
config:
let
@ -29,11 +30,7 @@ let
./modules/standalone.nix
../modules/top-level
];
specialArgs = {
inherit helpers;
lib = helpers.extendedLib;
defaultPkgs = pkgs;
} // extraSpecialArgs;
specialArgs = specialArgsWith extraSpecialArgs;
};
config = handleAssertions evaledModule.config;
in