From 2ad579435fdd0ab91c4c496116b59cc57bccf606 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Tue, 6 Sep 2022 20:00:11 +0300
Subject: [PATCH] Fix ssh agent forwarding for Moria

---
 home/.ssh/config | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/home/.ssh/config b/home/.ssh/config
index f6058f8..25e376e 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -7,6 +7,15 @@ host *
 	ControlPersist 10m
 	ControlPath ~/.ssh/%r@%h:%p.socket
 
+host moria
+	HostName korhonen.cc
+	port 221
+	User balrog
+	# Forward GPG agent
+	RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra
+	# Forward SSH agent
+	RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh
+
 host gitea
 	HostName korhonen.cc
 	user git
@@ -27,12 +36,6 @@ Host aur
 	HostName aur.archlinux.org
   	User aur
 
-host moria
-	HostName korhonen.cc
-	port 221
-	User balrog
-	RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra
-
 host moria-unlock
 	HostName korhonen.cc
 	port 221