From 49dfd40215355b237629c7007659d331b958eda4 Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Mon, 6 May 2024 20:41:11 +0200
Subject: [PATCH] added hydraJobs

---
 flake.lock                  | 32 +++++++++++++++++++++++---------
 flake.nix                   | 14 +++++++++-----
 lib/shinyflakes/default.nix |  2 ++
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 896ff46..37e9311 100644
--- a/flake.lock
+++ b/flake.lock
@@ -234,9 +234,7 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1707317562,
@@ -509,15 +507,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
-        "owner": "nixos",
+        "lastModified": 1714906307,
+        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -539,6 +537,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1712163089,
+        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -604,7 +618,7 @@
         "home-manager": "home-manager",
         "kyouma-www": "kyouma-www",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixvim": "nixvim",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
diff --git a/flake.nix b/flake.nix
index aaf2559..5363666 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
     };
     fernglas = {
       url = "github:wobcom/fernglas";
-      inputs.nixpkgs.follows = "nixpkgs";
+      #inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
     home-manager = {
@@ -45,10 +45,10 @@
 
   nixConfig = {
     builders-use-substitutes = true;
-    builders = [
-      "ssh://build@seras.kyouma.net x86_64-linux - 40 40 nixos-test,benchmark,big-parallel,kvm"
-      "ssh://build@integra.kyouma.net aarch64-linux - 4 8 nixos-test,benchmark,big-parallel,kvm"
-    ];    
+    builders = ''
+      ssh://build@seras.kyouma.net x86_64-linux - 40 40 nixos-test,benchmark,big-parallel,kvm
+      ssh://build@integra.kyouma.net aarch64-linux - 4 8 nixos-test,benchmark,big-parallel,kvm
+    '';
   };
 
   outputs = { self, nixpkgs, flake-utils, ... }@inputs: let
@@ -91,6 +91,10 @@
       kyouma = import ./pkgs/overlay.nix;
       default = self.overlays.kyouma;
     };
+    hydraJobs = {
+      inherit (self) packages images;
+      nixosConfigurations = shinyflakes.mapHydraHosts self.nixosConfigurations;
+    };
   } // flake-utils.lib.eachDefaultSystem (system: let
     pkgs = import nixpkgs {
       inherit system;
diff --git a/lib/shinyflakes/default.nix b/lib/shinyflakes/default.nix
index 057760c..97d02cc 100644
--- a/lib/shinyflakes/default.nix
+++ b/lib/shinyflakes/default.nix
@@ -46,4 +46,6 @@ in {
 
   mapPackages = overlayPkgs: otherPackages: nixpkgs.lib.recursiveUpdate (
     nixpkgs.lib.genAttrs (mapDir "pkgs") (name: overlayPkgs.${name})) otherPackages;
+
+  mapHydraHosts = hosts: builtins.mapAttrs (name: host: host.config.system.build.toplevel) hosts;
 }