From 2d3398b217fa282e2e69696a087d4ea085249544 Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Mon, 20 May 2024 00:33:06 +0100
Subject: [PATCH] remove sops paths

---
 home/common/optional/sops.nix | 3 +--
 scripts/bootstrap.sh          | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/home/common/optional/sops.nix b/home/common/optional/sops.nix
index ab1bb1b..505d6d6 100644
--- a/home/common/optional/sops.nix
+++ b/home/common/optional/sops.nix
@@ -12,8 +12,7 @@ in
   ];
 
   sops = {
-    age.keyFile = "${homeDirectory}/.config/sops/age/keys.txt";
-    age.sshKeyPaths = ["${homeDirectory}/.ssh/deploy_key-ssh-ed25519" "${homeDirectory}/.ssh/ssh_host_ed25519_key"];
+    age.sshKeyPaths = ["${homeDirectory}/.ssh/ssh_host_ed25519_key"];
 
     defaultSopsFile = "${secretsFile}";
     validateSopsFiles = false;
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 584c888..bcddd33 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -79,6 +79,10 @@ ssh-copy-id -i "$(readlink -f "$HOME/.ssh/ssh_host_ed25519_key.pub")" "$username
 scp -i "$(readlink -f "$HOME/.ssh/ssh_host_ed25519_key")" "$(readlink -f "$HOME/.ssh/deploy_key-ssh-ed25519")" "media@$ip:~/.ssh/deploy_key-ssh-ed25519"
 scp -i "$(readlink -f "$HOME/.ssh/ssh_host_ed25519_key")" "$(readlink -f "$HOME/.ssh/deploy_key-ssh-ed25519.pub")" "media@$ip:~/.ssh/deploy_key-ssh-ed25519.pub"
 
+# Copy previously generated ssh keys
+scp -i "$(readlink -f "$HOME/.ssh/ssh_host_ed25519_key")" "$KEY_DIR/$KEY_NAME" "media@$ip:~/.ssh/ssh_host_ed25519_key"
+scp -i "$(readlink -f "$HOME/.ssh/ssh_host_ed25519_key")" "$KEY_DIR/$KEY_NAME.pub" "media@$ip:~/.ssh/ssh_host_ed25519_key.pub"
+
 echo "Configuring target host ssh connection to enable connection to gitea repos:"
 read -r -d '' config << EOM
 Host git.bitlab21.com