From 758ee6e38c132bdc2ce31bd30ec29cfaaab0aeb2 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sat, 3 Apr 2021 21:53:29 +0100
Subject: [PATCH] hosts/athame: Moved hcloud ssh key definition into
 host-specific meta

---
 hosts/athame/meta.nix | 10 ++++++++++
 lib/deploy.nix        | 14 +-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/hosts/athame/meta.nix b/hosts/athame/meta.nix
index 3dff5c9c..2855858d 100644
--- a/hosts/athame/meta.nix
+++ b/hosts/athame/meta.nix
@@ -1,5 +1,15 @@
 { config, hosts, lib, ... }:
 with config.resources; {
+    resources.hcloud_ssh_key = {
+          provider = "hcloud";
+          type = "ssh_key";
+          inputs = {
+            name = "yubikey";
+            public_key =
+              "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCocjQqiDIvzq+Qu3jkf7FXw5piwtvZ1Mihw9cVjdVcsra3U2c9WYtYrA3rS50N3p00oUqQm9z1KUrvHzdE+03ZCrvaGdrtYVsaeoCuuvw7qxTQRbItTAEsfRcZLQ5c1v/57HNYNEsjVrt8VukMPRXWgl+lmzh37dd9w45cCY1QPi+JXQQ/4i9Vc3aWSe4X6PHOEMSBHxepnxm5VNHm4PObGcVbjBf0OkunMeztd1YYA9sEPyEK3b8IHxDl34e5t6NDLCIDz0N/UgzCxSxoz+YJ0feQuZtud/YLkuQcMxW2dSGvnJ0nYy7SA5DkW1oqcy6CGDndHl5StOlJ1IF9aGh0gGkx5SRrV7HOGvapR60RphKrR5zQbFFka99kvSQgOZqSB3CGDEQGHv8dXKXIFlzX78jjWDOBT67vA/M9BK9FS2iNnBF5x6shJ9SU5IK4ySxq8qvN7Us8emkN3pyO8yqgsSOzzJT1JmWUAx0tZWG/BwKcFBHfceAPQl6pwxx28TM3BTBRYdzPJLTkAy48y6iXW6UYdfAPlShy79IYjQtEThTuIiEzdzgYdros0x3PDniuAP0KOKMgbikr0gRa6zahPjf0qqBnHeLB6nHAfaVzI0aNbhOg2bdOueE1FX0x48sjKqjOpjlIfq4WeZp9REr2YHEsoLFOBfgId5P3BPtpBQ== cardno:000612078454";
+          };
+        };
+
   resources.athame = {
     provider = "hcloud";
     type = "server";
diff --git a/lib/deploy.nix b/lib/deploy.nix
index 88ff0a6b..863ad57d 100644
--- a/lib/deploy.nix
+++ b/lib/deploy.nix
@@ -72,19 +72,7 @@ let
           key_algorithm = "hmac-sha512";
         };
       };
-
-      resources = with config.resources; {
-        hcloud_ssh_key = {
-          provider = "hcloud";
-          type = "ssh_key";
-          inputs = {
-            name = "yubikey";
-            public_key =
-              "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCocjQqiDIvzq+Qu3jkf7FXw5piwtvZ1Mihw9cVjdVcsra3U2c9WYtYrA3rS50N3p00oUqQm9z1KUrvHzdE+03ZCrvaGdrtYVsaeoCuuvw7qxTQRbItTAEsfRcZLQ5c1v/57HNYNEsjVrt8VukMPRXWgl+lmzh37dd9w45cCY1QPi+JXQQ/4i9Vc3aWSe4X6PHOEMSBHxepnxm5VNHm4PObGcVbjBf0OkunMeztd1YYA9sEPyEK3b8IHxDl34e5t6NDLCIDz0N/UgzCxSxoz+YJ0feQuZtud/YLkuQcMxW2dSGvnJ0nYy7SA5DkW1oqcy6CGDndHl5StOlJ1IF9aGh0gGkx5SRrV7HOGvapR60RphKrR5zQbFFka99kvSQgOZqSB3CGDEQGHv8dXKXIFlzX78jjWDOBT67vA/M9BK9FS2iNnBF5x6shJ9SU5IK4ySxq8qvN7Us8emkN3pyO8yqgsSOzzJT1JmWUAx0tZWG/BwKcFBHfceAPQl6pwxx28TM3BTBRYdzPJLTkAy48y6iXW6UYdfAPlShy79IYjQtEThTuIiEzdzgYdros0x3PDniuAP0KOKMgbikr0gRa6zahPjf0qqBnHeLB6nHAfaVzI0aNbhOg2bdOueE1FX0x48sjKqjOpjlIfq4WeZp9REr2YHEsoLFOBfgId5P3BPtpBQ== cardno:000612078454";
-          };
-        };
-      };
-    });
+   });
 in {
   inherit tf;
   target =