modules.packages.git: fix

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 =
       {

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";
+          };
         };
       };
     })];

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";