From cf40fa60fc99f510b9e6f87372c9b846528a4836 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 6 Jan 2024 14:55:04 -0500
Subject: ci: clean up hydraJobs again

---
 dev/ci.nix | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/dev/ci.nix b/dev/ci.nix
index fc1b3ed..4116cd8 100644
--- a/dev/ci.nix
+++ b/dev/ci.nix
@@ -9,24 +9,15 @@
     getOutputs = lib.getAttrs ciSystems;
     mapCfgsToDerivs = lib.mapAttrs (_: cfg: cfg.activationPackage or cfg.config.system.build.toplevel);
     getCompatibleCfgs = lib.filterAttrs (_: cfg: lib.elem cfg.pkgs.system ciSystems);
-  in
-    lib.attrsets.mergeAttrsList [
-      {
-        checks = getOutputs self.checks;
-        devShells = getOutputs self.devShells;
+  in {
+    checks = getOutputs self.checks;
+    devShells = getOutputs self.devShells;
 
-        homeConfigurations = let
-          legacyPackages = getOutputs self.legacyPackages;
-        in
-          lib.mapAttrs (_: v: mapCfgsToDerivs v.homeConfigurations) legacyPackages;
-      }
+    homeConfigurations = let
+      legacyPackages = getOutputs self.legacyPackages;
+    in
+      lib.mapAttrs (_: v: mapCfgsToDerivs v.homeConfigurations) legacyPackages;
 
-      (
-        lib.genAttrs [
-          # "darwinConfigurations"
-          "nixosConfigurations"
-        ]
-        (type: mapCfgsToDerivs (getCompatibleCfgs self.${type}))
-      )
-    ];
+    nixosConfigurations = mapCfgsToDerivs (getCompatibleCfgs self.nixosConfigurations);
+  };
 }
-- 
cgit v1.2.3