mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 08:35:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

docs: call evalModules in one place

Browse source
This commit is contained in:
Matt Sturgeon 2024-08-02 01:45:45 +01:00
parent 27c4c9c210
commit 0bc1699037
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
2 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
docs/default.nix
View file

@ -40,8 +40,6 @@ let
pkgs = pkgsDoc;
};
inherit (helpers.modules) specialArgs;
nixvimPath = toString ./..;
gitHubDeclaration = user: repo: branch: subpath: {
@ -66,18 +64,20 @@ let
) opt.declarations;
};
evaledModules = lib.evalModules {
inherit (helpers.modules) specialArgs;
modules = [
../modules/top-level
{ isDocs = true; }
];
};
hmOptions = builtins.removeAttrs (lib.evalModules {
modules = [ (import ../wrappers/modules/hm.nix { inherit lib; }) ];
}).options [ "_module" ];
hmOptions = builtins.removeAttrs (lib.evalModules { modules = [ ../wrappers/modules/hm.nix ]; })
.options [ "_module" ];
options-json =
(pkgsDoc.nixosOptionsDoc {
inherit (lib.evalModules { inherit modules specialArgs; }) options;
inherit (evaledModules) options;
inherit transformOptions;
warningsAreErrors = false;
}).optionsJSON;
@ -105,12 +105,7 @@ in
# Do not check if documentation builds fine on darwin as it fails:
# > sandbox-exec: pattern serialization length 69298 exceeds maximum (65535)
docs = pkgsDoc.callPackage ./mdbook {
inherit
modules
hmOptions
transformOptions
specialArgs
;
inherit evaledModules hmOptions transformOptions;
# TODO: Find how to handle stable when 24.11 lands
search = mkSearch "/nixvim/search/";
};

11
docs/mdbook/default.nix
View file

@ -1,18 +1,15 @@
{
pkgs,
lib,
modules,
evaledModules,
nixosOptionsDoc,
transformOptions,
hmOptions,
search,
specialArgs,
}:
with lib;
let
options = lib.evalModules { inherit modules specialArgs; };
inherit (options.config.meta) nixvimInfo;
inherit (evaledModules.config.meta) nixvimInfo;
mkMDDoc =
options:
@ -62,7 +59,7 @@ let
moduleDoc =
let
info = optionalAttrs (hasAttrByPath path nixvimInfo) (getAttrFromPath path nixvimInfo);
maintainers = lib.unique (options.config.meta.maintainers.${info.file} or [ ]);
maintainers = lib.unique (evaledModules.config.meta.maintainers.${info.file} or [ ]);
maintainersNames = builtins.map maintToMD maintainers;
maintToMD = m: if m ? github then "[${m.name}](https://github.com/${m.github})" else m.name;
in
@ -179,7 +176,7 @@ let
recurse modules;
docs = rec {
modules = processModulesRec (removeUnwanted options.options);
modules = processModulesRec (removeUnwanted evaledModules.options);
commands = mapModulesToString (
name: opts:
let