hydra: better attrset scheme

1 files changed, 53 insertions, 38 deletions

diff --git a/flake.nix b/flake.nix
index 3f0a083..ccd6110 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,48 +3,63 @@
 
   inputs.robotnix.url = "github:danielfullmer/robotnix";
 
-  outputs = { self, robotnix }: let
-    common = {
-      apps = {
-        bromite.enable = true;
-        fdroid.enable = true;
-        seedvault.enable = true;
-      };
+  outputs = { self, robotnix }:
+    let
+      common = {
+        apps = {
+          bromite.enable = true;
+          fdroid.enable = true;
+          seedvault.enable = true;
+        };
+
+        microg.enable = true;
+
+        webview.bromite = {
+          enable = true;
+          availableByDefault = true;
+        };
 
-      microg.enable = true;
+        # signing.enable = true;
+        # signing.keyStorePath = "/var/secrets/android-keys"; # A _string_ of the path for the key store.
 
-      webview.bromite = {
-        enable = true;
-        availableByDefault = true;
+        # Build with ccache
+        ccache.enable = true;
       };
+    in
+    {
+      # "dailydriver" is an arbitrary user-chosen name for this particular
+      # configuration.  Change it to something meaningful for you, perhaps just
+      # the device name if you only have one of this kind of device.
+      robotnixConfigurations.fp3 = robotnix.lib.robotnixSystem ({ config, pkgs, ... }: {
+        device = "FP3";
+        flavor = "lineageos";
+      } // common);
 
-      # signing.enable = true;
-      # signing.keyStorePath = "/var/secrets/android-keys"; # A _string_ of the path for the key store.
+      robotnixConfigurations.fp2 = robotnix.lib.robotnixSystem ({ config, pkgs, ... }: {
+        device = "FP2";
+        flavor = "lineageos";
+      } // common);
 
-      # Build with ccache
-      ccache.enable = true;
-    };
-  in {
-    # "dailydriver" is an arbitrary user-chosen name for this particular
-    # configuration.  Change it to something meaningful for you, perhaps just
-    # the device name if you only have one of this kind of device.
-    robotnixConfigurations.fp3 = robotnix.lib.robotnixSystem ({ config, pkgs, ... }: {
-      device = "FP3";
-      flavor = "lineageos";
-    } // common);
-
-    robotnixConfigurations.fp2 = robotnix.lib.robotnixSystem ({ config, pkgs, ... }: {
-      device = "FP2";
-      flavor = "lineageos";
-    } // common);
-
-    # This provides a convenient output which allows you to build the image by
-    # simply running "nix build" on this flake.
-    # Build other outputs with (for example): "nix build .#robotnixConfigurations.dailydriver.ota"
-    defaultPackage.x86_64-linux = self.robotnixConfigurations.fp3.img;
-
-    hydraJobs = {
-      inherit (self.robotnixConfigurations) fp2 fp3;
+      # This provides a convenient output which allows you to build the image by
+      # simply running "nix build" on this flake.
+      # Build other outputs with (for example): "nix build .#robotnixConfigurations.dailydriver.ota"
+      defaultPackage.x86_64-linux = self.robotnixConfigurations.fp3.img;
+
+      hydraJobs.robotnixConfigurations = {
+        fp3 = {
+          inherit (self.robotnixConfigurations.fp3)
+            bootImg
+            factoryImg
+            img
+            ota;
+        };
+        fp2 = {
+          inherit (self.robotnixConfigurations.fp2)
+            bootImg
+            factoryImg
+            img
+            ota;
+        };
+      };
     };
-  };
 }