From 80778736bde694d341f857de20d6e81e32837bed Mon Sep 17 00:00:00 2001
From: Edvin Norling <edvin.norling@xenit.se>
Date: Mon, 20 Jun 2022 10:25:51 +0200
Subject: [PATCH] Fix keychain config

---
 ansible/roles/laptop/vars/main.yml | 1 +
 direnv/direnv/create_workspace.sh  | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/laptop/vars/main.yml b/ansible/roles/laptop/vars/main.yml
index 7f27a0e..9622f52 100644
--- a/ansible/roles/laptop/vars/main.yml
+++ b/ansible/roles/laptop/vars/main.yml
@@ -17,6 +17,7 @@ fedoraPackages:
   - golang
   - podman-docker # it's a simple alias for docker
   - azure-cli
+  - keychain
 
 flatpacks:
   - com.slack.Slack
diff --git a/direnv/direnv/create_workspace.sh b/direnv/direnv/create_workspace.sh
index 6c6a3aa..2decf50 100644
--- a/direnv/direnv/create_workspace.sh
+++ b/direnv/direnv/create_workspace.sh
@@ -14,12 +14,15 @@ fi
 
 # Environment variables
 export KUBECONFIG=$(pwd)/.kube/config
-export GIT_SSH_COMMAND="ssh -i $(pwd)/.ssh/$(basename $(pwd))_id_rsa"
+export GIT_SSH_COMMAND="ssh -i $(pwd)/.ssh/id_rsa -o 'HostkeyAlgorithms=+ssh-rsa' -o 'PubkeyAcceptedKeyTypes=+ssh-rsa'"
 export AZURE_CONFIG_DIR=$(pwd)/.azure
 
-ssh-add -q $(pwd)/.ssh/$(basename $(pwd))_id_rsa
+ssh-add -q $(pwd)/.ssh/id_rsa
 
 # Configuration folders
 [ -d $(pwd)/.envrc_backups ] || mkdir $(pwd)/.envrc_backups # Store .envrc backups here
 [ -d $(pwd)/.kube ] || mkdir $(pwd)/.kube # Store Kubernetes (kubectl) configuration here
 [ -d $(pwd)/.azure ] || mkdir $(pwd)/.azure # Store Azure CLI configuration here
+
+# use keychain
+eval $(keychain --eval $(pwd)/.ssh/id_rsa)