From ffd829142f46a617bc5b381b49999ae48a80d3a1 Mon Sep 17 00:00:00 2001
From: Spencer Gilbert <me@spencergilbert.dev>
Date: Sat, 1 Aug 2026 09:14:57 -0400
Subject: [PATCH] [ssh] Drop duplicated IdentityAgent, and forward 1password
 properly

---
 ssh/conf.d/10-linux.conf  | 5 ++++-
 ssh/conf.d/99-global.conf | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ssh/conf.d/10-linux.conf b/ssh/conf.d/10-linux.conf
index cd55cfc..29089d9 100644
--- a/ssh/conf.d/10-linux.conf
+++ b/ssh/conf.d/10-linux.conf
@@ -1,2 +1,5 @@
-Match exec "test $(uname -s) = Linux"
+Match host * exec "test $(uname -s) = Linux" exec "test -z $SSH_TTY"
     IdentityAgent ~/.1password/agent.sock
+
+Host desktop
+    ForwardAgent yes
diff --git a/ssh/conf.d/99-global.conf b/ssh/conf.d/99-global.conf
index 35f20e5..2b09fac 100644
--- a/ssh/conf.d/99-global.conf
+++ b/ssh/conf.d/99-global.conf
@@ -1,5 +1,4 @@
 Host *
-        IdentityAgent ~/.1password/agent.sock
         ServerAliveInterval 60
         ServerAliveCountMax 3
 
-- 
2.51.2