1 files changed, 8 insertions, 11 deletions
diff --git a/dev/ci.nix b/dev/ci.nix
index 4116cd8..2d5f583 100644
--- a/dev/ci.nix
+++ b/dev/ci.nix
@@ -7,17 +7,14 @@
     ciSystems = ["x86_64-linux"];
 
     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 {
-    checks = getOutputs self.checks;
-    devShells = getOutputs self.devShells;
-
-    homeConfigurations = let
-      legacyPackages = getOutputs self.legacyPackages;
-    in
-      lib.mapAttrs (_: v: mapCfgsToDerivs v.homeConfigurations) legacyPackages;
-
-    nixosConfigurations = mapCfgsToDerivs (getCompatibleCfgs self.nixosConfigurations);
-  };
+    getConfigurations = type: mapCfgsToDerivs (getCompatibleCfgs self."${type}Configurations");
+  in
+    {
+      checks = getOutputs self.checks;
+      devShells = getOutputs self.devShells;
+    }
+    // lib.genAttrs ["nixos" "home"] getConfigurations;
 }