nixosModules/clanCore: support nix-darwin

lib/build-clan/machineModules/forName.nix

@@ -9,30 +9,24 @@
   ...
 }:
 {
-  imports = [
-    {
-      imports = builtins.filter builtins.pathExists (
-        [
-          "${directory}/machines/${name}/configuration.nix"
-        ]
-        ++ lib.optionals (_class == "nixos") [
-          "${directory}/machines/${name}/hardware-configuration.nix"
-          "${directory}/machines/${name}/disko.nix"
-        ]
-      );
-    }
-    (lib.optionalAttrs (_class == "nixos") {
-      clan.core.settings = {
-        inherit (meta) name icon;
-        inherit directory;
-        machine = {
-          inherit name;
-        };
-      };
-    })
-    # TODO: move into nixos modules
-    ({
-      networking.hostName = lib.mkDefault name;
-    })
-  ];
+  imports = builtins.filter builtins.pathExists (
+    [
+      "${directory}/machines/${name}/configuration.nix"
+    ]
+    ++ lib.optionals (_class == "nixos") [
+      "${directory}/machines/${name}/hardware-configuration.nix"
+      "${directory}/machines/${name}/disko.nix"
+    ]
+  );
+
+  clan.core.settings = {
+    inherit (meta) name icon;
+    inherit directory;
+    machine = {
+      inherit name;
+    };
+  };
+
+  # TODO: move into nixosModules
+  networking.hostName = lib.mkDefault name;
 }

lib/build-clan/module.nix

@@ -221,17 +221,11 @@ in
 
     # machine specifics
     machines = configsPerSystem;
-    all-machines-json =
-      if !lib.hasAttrByPath [ "darwinModules" "clanCore" ] clan-core then
-        lib.mapAttrs (
-          system: configs:
-          nixpkgs.legacyPackages.${system}.writers.writeJSON "machines.json" (
-            lib.mapAttrs (_: m: m.config.system.clan.deployment.data) (
-              lib.filterAttrs (_n: v: v.class == "nixos") configs
-            )
-          )
-        ) configsPerSystem
-      else
-        throw "remove NixOS filter and support nix-darwin as well";
+    all-machines-json = lib.mapAttrs (
+      system: configs:
+      nixpkgs.legacyPackages.${system}.writers.writeJSON "machines.json" (
+        lib.mapAttrs (_: m: m.config.system.clan.deployment.data) configs
+      )
+    ) configsPerSystem;
   };
 }