Revert "nixos-module: Fix potential recursion between users.users and home-ma…" (#6745)

This reverts commit 216690777e.

Reverts #6622

Seems to be causing issues for other users, though. Will revert and we can try again with some tests in place.

docs/default.nix

@@ -54,17 +54,17 @@ let
 
   hmPath = toString ./..;
 
-  buildOptionsDocs =
-    args@{ modules, includeModuleSystemOptions ? true, isNixos ? false, ... }:
+  buildOptionsDocs = args@{ modules, includeModuleSystemOptions ? true, ... }:
     let
       options = (lib.evalModules {
         inherit modules;
         class = "homeManager";
       }).options;
     in pkgs.buildPackages.nixosOptionsDoc ({
-      options = builtins.removeAttrs options ([ ]
-        ++ (lib.optional (!includeModuleSystemOptions) "_module")
-        ++ (lib.optional (isNixos) "users"));
+      options = if includeModuleSystemOptions then
+        options
+      else
+        builtins.removeAttrs options [ "_module" ];
       transformOptions = opt:
         opt // {
           # Clean up declaration sites to not refer to the Home Manager
@@ -80,11 +80,7 @@ let
             else
               decl) opt.declarations;
         };
-    } // builtins.removeAttrs args [
-      "modules"
-      "includeModuleSystemOptions"
-      "isNixos"
-    ]);
+    } // builtins.removeAttrs args [ "modules" "includeModuleSystemOptions" ]);
 
   hmOptionsDocs = buildOptionsDocs {
     modules = import ../modules/modules.nix {
@@ -97,7 +93,6 @@ let
   nixosOptionsDocs = buildOptionsDocs {
     modules = [ ../nixos scrubbedPkgsModule dontCheckDefinitions ];
     includeModuleSystemOptions = false;
-    isNixos = true;
     variablelistId = "nixos-options";
     optionIdPrefix = "nixos-opt-";
   };
@@ -105,7 +100,6 @@ let
   nixDarwinOptionsDocs = buildOptionsDocs {
     modules = [ ../nix-darwin scrubbedPkgsModule dontCheckDefinitions ];
     includeModuleSystemOptions = false;
-    isNixos = true;
     variablelistId = "nix-darwin-options";
     optionIdPrefix = "nix-darwin-opt-";
   };