diff --git a/docs/default.nix b/docs/default.nix index 0f6546d4..2a741c72 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -58,7 +58,10 @@ let ) opt.declarations; }; - modules = [ ../modules/top-level ]; + modules = [ + ../modules/top-level + { isDocs = true; } + ]; hmOptions = builtins.removeAttrs (lib.evalModules { modules = [ (import ../wrappers/modules/hm.nix { inherit lib; }) ]; @@ -73,7 +76,6 @@ rec { specialArgs = { inherit helpers; defaultPkgs = pkgsDoc; - isDocs = true; }; }) options diff --git a/docs/mdbook/default.nix b/docs/mdbook/default.nix index 649b2994..8ff49328 100644 --- a/docs/mdbook/default.nix +++ b/docs/mdbook/default.nix @@ -14,7 +14,6 @@ let specialArgs = { inherit helpers; defaultPkgs = pkgs; - isDocs = true; }; }; diff --git a/modules/misc/context.nix b/modules/misc/context.nix new file mode 100644 index 00000000..170372ac --- /dev/null +++ b/modules/misc/context.nix @@ -0,0 +1,14 @@ +{ lib, ... }: +{ + options = { + isDocs = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether modules are being evaluated to build documentation. + ''; + internal = true; + visible = false; + }; + }; +} diff --git a/modules/misc/default.nix b/modules/misc/default.nix index ede3a061..f30502bf 100644 --- a/modules/misc/default.nix +++ b/modules/misc/default.nix @@ -6,6 +6,7 @@ let in { imports = [ + ./context.nix ./nixpkgs.nix ./nixvim-info.nix (nixosModules + "/misc/assertions.nix") diff --git a/modules/top-level/files/default.nix b/modules/top-level/files/default.nix index 53d3a4b0..cdd2910c 100644 --- a/modules/top-level/files/default.nix +++ b/modules/top-level/files/default.nix @@ -3,12 +3,10 @@ config, lib, helpers, - specialArgs, ... }: let inherit (lib) types; - isDocs = specialArgs.isDocs or false; fileModuleType = types.submoduleWith { shorthandOnlyDefinesConfig = true; @@ -17,7 +15,7 @@ let defaultPkgs = pkgs; }; # Don't include the modules in the docs, as that'd be redundant - modules = lib.optionals (!isDocs) [ + modules = lib.optionals (!config.isDocs) [ ../../. ./submodule.nix ];