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