modules: refactor module bootstrapping

Let's simplify things by defining all modules in `./plugins`, `./modules`
and `./wrappers/modules`.

Instead of currying `pkgs` into a bootstrapping module, we can require
`defaultPkgs` be provided as a special arg.

This refactor allows us to completely remove `flake-modules/modules.nix`!
This commit is contained in:
Matt Sturgeon 2024-07-02 13:30:29 +01:00
parent 3d96960348
commit d2afb176ff
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
16 changed files with 129 additions and 159 deletions

View file

@ -1,9 +1,5 @@
default_pkgs:
{
modules,
self,
getHelpers,
}:
{ self, getHelpers }:
{
pkgs ? default_pkgs,
extraSpecialArgs ? { },
@ -14,23 +10,11 @@ let
inherit (pkgs) lib;
helpers = getHelpers pkgs _nixvimTests;
shared = import ./_shared.nix { inherit modules helpers; } {
shared = import ./_shared.nix helpers {
inherit pkgs lib;
config = { };
};
mkEval =
mod:
lib.evalModules {
modules = [
mod
{ wrapRc = true; }
] ++ shared.topLevelModules;
specialArgs = {
inherit helpers;
} // extraSpecialArgs;
};
handleAssertions =
config:
let
@ -44,7 +28,16 @@ let
mkNvim =
mod:
let
evaledModule = mkEval mod;
evaledModule = lib.evalModules {
modules = [
mod
{ wrapRc = true; }
] ++ shared.topLevelModules;
specialArgs = {
inherit helpers;
defaultPkgs = pkgs;
} // extraSpecialArgs;
};
config = handleAssertions evaledModule.config;
in
(pkgs.symlinkJoin {