From a05cdfd35c279a16da6a396d0a957685d0f0b30a Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sun, 12 Mar 2023 08:54:54 -0700
Subject: [PATCH] [IAC] Remaining fix-ups

---
 .gitignore    |  1 +
 config.yaml   |  2 --
 iac/device.go |  2 +-
 iac/files.go  | 15 ++++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index c68a9ceb..e3a6ca51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 venv/
 .direnv/
 result
+.DS_Store
 /kittywitch
 data/
diff --git a/config.yaml b/config.yaml
index 4d125b1b..0ff942e2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -64,5 +64,3 @@ zones:
   kittywitch:
     name: kittywit.ch
 machines:
-  ran:
-    provider: hcloud
diff --git a/iac/device.go b/iac/device.go
index 1f21b2f2..0f5bb185 100644
--- a/iac/device.go
+++ b/iac/device.go
@@ -129,7 +129,7 @@ func (d *Device) handleOSH(CAKey *tls.PrivateKey) (err error) {
 		Duration:  pulumi.String("730h"),
 		Hostname:  pulumi.String(d.Tailskip),
 		Kind:      pulumi.String("host"),
-		Userkey:   d.PrivateKey.PrivateKeyOpenssh,
+		Userkey:   d.PrivateKeyED25519.PrivateKeyOpenssh,
 	}, pulumi.Provider(oshProvider))
 	if err != nil {
 		return err
diff --git a/iac/files.go b/iac/files.go
index be7f28f3..805eb4a8 100644
--- a/iac/files.go
+++ b/iac/files.go
@@ -15,15 +15,16 @@ func CreatePulumiFile(ctx *pulumi.Context, name string, fqdn string, value pulum
 	ctx.Export(name, value)
 	return remote.NewCommand(ctx, name, &remote.CommandArgs{
 		Connection: &remote.ConnectionArgs{
-			Host:            pulumi.String(fqdn),
-			Port:            pulumi.Float64Ptr(float64(port)),
-			User:            pulumi.String(user),
-      // TODO: note to self, write platform support code here. or just expect env var $SSH_AUTH_SOCK?
-			AgentSocketPath: pulumi.String("/run/user/1000/gnupg/S.gpg-agent.ssh"),
+			Host: pulumi.String(fqdn),
+			Port: pulumi.Float64Ptr(float64(port)),
+			User: pulumi.String(user),
+			// TODO: note to self, write platform support code here. or just expect env var $SSH_AUTH_SOCK?
+			//AgentSocketPath: pulumi.String("/run/user/1000/gnupg/S.gpg-agent.ssh"), // linux
+			AgentSocketPath: pulumi.String("/Users/kat/.gnupg/S.gpg-agent.ssh"), // darwin
 		},
 		Triggers: pulumi.All(resources),
-    Create:   pulumi.Sprintf("echo \"%s\" > \"/tmp/%s\" && sudo mkdir -p /var/lib/secrets && sudo install --owner=kat --group=users --mode=0600 \"/tmp/%s\" \"/var/lib/secrets/%s\"", value, name, name, name),
-    Delete:   pulumi.Sprintf("cd /var/lib/secrets && rm \"%s\"", name),
+		Create:   pulumi.Sprintf("echo \"%s\" > \"/tmp/%s\" && sudo mkdir -p /var/lib/secrets && sudo install --owner=kat --group=users --mode=0600 \"/tmp/%s\" \"/var/lib/secrets/%s\"", value, name, name, name),
+		Delete:   pulumi.Sprintf("cd /var/lib/secrets && rm \"%s\"", name),
 		Environment: pulumi.StringMap{
 			"PULUMI_SKIP_UPDATE_CHECK": pulumi.String("true"),
 		},