hosts/devosSystem: pass modules as attrset

hosts/default.nix

@@ -13,8 +13,7 @@ let
 
   suites = import ../suites { inherit lib; };
 
-  modules =
-    let
+  modules = {
     core = ../profiles/core;
     modOverrides = { config, overrideModulesPath, ... }:
       let
@@ -52,15 +51,8 @@ let
     };
 
     # Everything in `./modules/list.nix`.
-      flakeModules =
-        builtins.attrValues self.nixosModules;
-
-    in
-    flakeModules ++ [
-      core
-      global
-      modOverrides
-    ] ++ extern.modules;
+    flakeModules = { imports = builtins.attrValues self.nixosModules ++ extern.modules; };
+  };
 
   specialArgs = extern.specialArgs // { inherit suites; };
 
@@ -79,19 +71,16 @@ let
             (removeAttrs hosts [ hostName ]);
         };
       };
+      lib = {
+        lib = { inherit specialArgs; };
+        lib.testModule = {
+          imports = builtins.attrValues modules;
+        };
+      };
     in
     dev.os.devosSystem {
       inherit system specialArgs;
-
-      modules = modules ++ [
-        local
-        {
-          lib = { inherit specialArgs; };
-          lib.testModule = {
-            imports = modules;
-          };
-        }
-      ];
+      modules = modules // { inherit local lib; };
     };
 
   hosts = dev.os.recImport

lib/devos/devosSystem.nix

@@ -4,12 +4,13 @@
 lib.nixosSystem (args // {
   modules =
     let
+      moduleList = builtins.attrValues modules;
       modpath = "nixos/modules";
       cd = "installer/cd-dvd/installation-cd-minimal-new-kernel.nix";
 
       isoConfig = (lib.nixosSystem
         (args // {
-          modules = modules ++ [
+          modules = moduleList ++ [
             "${nixos}/${modpath}/${cd}"
             ({ config, ... }: {
               isoImage.isoBaseName = "nixos-" + config.networking.hostName;
@@ -58,7 +59,7 @@ lib.nixosSystem (args // {
           ];
         })).config;
     in
-    modules ++ [{
+    moduleList ++ [{
       system.build = {
         iso = isoConfig.system.build.isoImage;
       };