From 2dd7a0b60dd144cf6c688298594fb3b2b7826c09 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Wed, 25 May 2022 09:56:06 +0200
Subject: [PATCH 1/3] fixup! Merge branch 'hci-improvements'

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index fd416c4..bc6321d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,7 +63,7 @@
       mkNixOS = mkNixOS' lib;  
 
       mkDeployEffect = branch: name: host: let
-        subdomain = hosts.enterprise.subdomain or "services";
+        subdomain = host.enterprise.subdomain or "services";
         hostname = "${lib.toLower name}.${subdomain}.${meta.domain}";
       in effects.runIf (branch == "master") (effects.runNixOS {
         requiredSystemFeatures = [ "hci-deploy-agent-nixos" ];

From bafa957e128ca6930a198beb5f6302357d2ef9fb Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Wed, 25 May 2022 18:44:57 +0200
Subject: [PATCH 2/3] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'hercules-ci-effects':
    'github:hercules-ci/hercules-ci-effects/1f904af1824e7393702daaf40a8fed56ebead0d7' (2022-05-24)
  → 'github:hercules-ci/hercules-ci-effects/0ab66b56d3f2b40ddfd981899d1757773632075f' (2022-05-25)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1aae649..3ee775d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -313,11 +313,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1653415319,
-        "narHash": "sha256-h+YUX7ZYujf73KL1R07LsEnhV7uV8oxSKEhH4bDj0Jc=",
+        "lastModified": 1653487348,
+        "narHash": "sha256-lWqxXMRqO8blpwhH2qvrFBVp6aZ7V+Z3xTqkNWKyLQw=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "1f904af1824e7393702daaf40a8fed56ebead0d7",
+        "rev": "0ab66b56d3f2b40ddfd981899d1757773632075f",
         "type": "github"
       },
       "original": {

From 1cb46f9fa890c43d26c95b7e40ba71ccdd0682b6 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Wed, 25 May 2022 18:45:19 +0200
Subject: [PATCH 3/3] Remove workaround for
 https://github.com/hercules-ci/hercules-ci-effects/issues/68

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index bc6321d..d0bcb69 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,7 +67,7 @@
         hostname = "${lib.toLower name}.${subdomain}.${meta.domain}";
       in effects.runIf (branch == "master") (effects.runNixOS {
         requiredSystemFeatures = [ "hci-deploy-agent-nixos" ];
-        config = self.nixosConfigurations.${name}.config // { outPath = "wtfwtfwtfwtfwtfwtf"; };
+        inherit (self.nixosConfigurations.${name}) config;
         secretsMap.ssh = "deploy-ssh";
 
         userSetupScript = ''