Fix keychain config

NissesSenap · Jun 20, 2022 · 8077873 · 8077873
1 parent 3f534c8
commit 8077873
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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)