From 37d4ac85b2450a407d8528aef1f5de38fbabb72d Mon Sep 17 00:00:00 2001
From: "RingOfStorms (Joshua Bell)" <ringofstorms@gmail.com>
Date: Tue, 29 Apr 2025 14:04:55 -0500
Subject: [PATCH] use git as ssh user so it doesn't need to be in the clone url

---
 common/_containers/forgejo.nix    | 1 +
 common/_home_manager/mods/ssh.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/_containers/forgejo.nix b/common/_containers/forgejo.nix
index 795c320..40e0bbe 100644
--- a/common/_containers/forgejo.nix
+++ b/common/_containers/forgejo.nix
@@ -159,6 +159,7 @@ in
               SSH_LISTEN_HOST = "0.0.0.0";
               SSH_LISTEN_PORT = 3032; # actual listen port
               SSH_PORT = 3032; # used in UI
+              BUILTIN_SSH_SERVER_USER = "git";
 
               LANDING_PAGE = "explore";
             };
diff --git a/common/_home_manager/mods/ssh.nix b/common/_home_manager/mods/ssh.nix
index 04e71eb..44b6921 100644
--- a/common/_home_manager/mods/ssh.nix
+++ b/common/_home_manager/mods/ssh.nix
@@ -24,7 +24,7 @@ in
       # };
       "git.joshuabell.xyz" = {
         identityFile = age.secrets.nix2gitforgejo.path;
-        user = "forgejo";
+        user = "git";
       };
       # PERSONAL DEVICES
       "lio" = {