modules: move nixos defaults module to modules file

Author: montchr

src/mkFlake/fup-adapter.nix

@@ -69,11 +69,7 @@ let
       specialArgs = config.nixos.importables // { inherit (config) self inputs; };
 
       modules = config.nixos.hostDefaults.exportedModules ++ defaultHostModules ++ [
-        ({ config, pkgs, self, ... }: {
-          users.mutableUsers = lib.mkDefault false;
-          hardware.enableRedistributableFirmware = lib.mkDefault true;
-          system.configurationRevision = lib.mkIf (self ? rev) self.rev;
-        })
+        internal-modules.nixosDefaults
       ];
     }
     (stripNull config.nixos.hostDefaults);

src/modules.nix

@@ -29,21 +29,6 @@
         lib.mkDefault builds;
     };
 
-  hmNixosDefaults = { specialArgs, modules }:
-    { options, ... }: {
-      config = lib.optionalAttrs (options ? home-manager) {
-        home-manager = {
-          # always use the system nixpkgs from the host's channel
-          useGlobalPkgs = true;
-          # and use the possible future default (see manual)
-          useUserPackages = lib.mkDefault true;
-
-          extraSpecialArgs = specialArgs;
-          sharedModules = modules;
-        };
-      };
-    };
-
   globalDefaults = { hmUsers }:
     { config, pkgs, self, ... }: {
       # digga lib can be accessed in modules directly as config.lib.digga
@@ -59,4 +44,25 @@
         '';
       };
     };
+
+  nixosDefaults = { self, ... }: {
+    users.mutableUsers = lib.mkDefault false;
+    hardware.enableRedistributableFirmware = lib.mkDefault true;
+    system.configurationRevision = lib.mkIf (self ? rev) self.rev;
+  };
+
+  hmNixosDefaults = { specialArgs, modules }:
+    { options, ... }: {
+      config = lib.optionalAttrs (options ? home-manager) {
+        home-manager = {
+          # always use the system nixpkgs from the host's channel
+          useGlobalPkgs = true;
+          # and use the possible future default (see manual)
+          useUserPackages = lib.mkDefault true;
+
+          extraSpecialArgs = specialArgs;
+          sharedModules = modules;
+        };
+      };
+    };
 }