From 14aab3cdcf334753fe5f204e3f8d43037d32850a Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sat, 27 Sep 2025 10:44:40 +0800
Subject: [PATCH] modules.packages.git: fix

---
 modules/packages/git.nix | 3 ++-
 modules/packages/ssh.nix | 8 +++++++-
 modules/user/chn/git.nix | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/packages/git.nix b/modules/packages/git.nix
index f9c82321..c965dde3 100644
--- a/modules/packages/git.nix
+++ b/modules/packages/git.nix
@@ -7,7 +7,8 @@ inputs:
     programs.git =
     {
       enable = true;
-      package = inputs.pkgs.gitFull;
+      # do not use gitFull, otherwise it will use its own ssh
+      # package = inputs.pkgs.gitFull;
       lfs = { enable = true; enablePureSSHTransfer = true; };
       config =
       {
diff --git a/modules/packages/ssh.nix b/modules/packages/ssh.nix
index 824c4125..ae9ea2f3 100644
--- a/modules/packages/ssh.nix
+++ b/modules/packages/ssh.nix
@@ -62,7 +62,13 @@ inputs:
             extraOptions.AddKeysToAgent = "yes";
           };
           "wg0.jykang" = jykang // { host = "wg0.jykang"; proxyJump = "wg0.srv2"; };
-          "*" = { controlMaster = "auto"; controlPersist = "1m"; compression = true; };
+          "*" =
+          {
+            controlMaster = "auto";
+            controlPersist = "1m";
+            compression = true;
+            controlPath = "~/.ssh/master-%r@%n:%p";
+          };
         };
       };
     })];
diff --git a/modules/user/chn/git.nix b/modules/user/chn/git.nix
index 2476c7e6..31710e06 100644
--- a/modules/user/chn/git.nix
+++ b/modules/user/chn/git.nix
@@ -5,7 +5,6 @@ inputs:
     home-manager.users.chn.config.programs.git =
     {
       enable = true;
-      package = inputs.pkgs.gitFull;
       extraConfig =
       {
         core.editor = if inputs.config.nixos.model.type == "desktop" then "code --wait" else "hx";