From bbc42c202fb2a887cbca148602aa470558db9966 Mon Sep 17 00:00:00 2001
From: Adam Hellberg <sharparam@sharparam.com>
Date: Fri, 31 Jan 2025 03:30:14 +0100
Subject: [PATCH] Experiment with 1Password for SSH

---
 git/.config/git/config | 7 ++++++-
 zsh/.zshenv            | 3 +++
 zsh/.zshrc             | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/git/.config/git/config b/git/.config/git/config
index 0df4638..2dd1ecd 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -1,7 +1,12 @@
 [user]
   email = sharparam@sharparam.com
   name = Adam Hellberg
-  signingkey = C58C41E27B00AD04
+  ; signingkey = C58C41E27B00AD04
+  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZcQxmr5ZfF/d0YqEZfhr0ZjuHUjxKBf7YgVjYqS+gE
+[gpg]
+  format = ssh
+[gpg "ssh"]
+  program = "/opt/1Password/op-ssh-sign"
 [alias]
   dft = difftool
 [push]
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 9202913..67f293c 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -28,6 +28,9 @@ fi
 export BASE16_THEME="eighties"
 export CATPPUCCIN_THEME="macchiato"
 
+unset SSH_AGENT_PID
+export SSH_AUTH_SOCK="$HOME/.1password/agent.sock"
+
 # WTF, Ansible?
 export ANSIBLE_NOCOWS=1
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 2ed8803..46df077 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -307,8 +307,10 @@ else
   #    source "$XDG_RUNTIME_DIR/ssh-agent.env" > /dev/null
   #  fi
   #else
-  unset SSH_AGENT_PID
-  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+  # Experiment with 1Password as SSH agent for a bit,
+  # so disable these env vars for now (see .zshenv)
+  # unset SSH_AGENT_PID
+  # export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
   #fi
   gpgconf --launch gpg-agent
 fi
-- 
2.54.0