home/modules/ssh.nix

@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) types;
-  controlSocket = "~/.ssh/controlmasters/%C.sock";
+  controlDir = "~/.ssh/controlmasters";
 
   proxyTagType = types.submodule (
     { name, ... }:
@@ -84,7 +84,7 @@ in
           hashKnownHosts = false;
           userKnownHostsFile = "~/.ssh/known_hosts";
           controlMaster = "no";
-          controlPath = controlSocket;
+          controlPath = "${controlDir}/%r@%n:%p";
           controlPersist = "no";
         };
       }
@@ -93,11 +93,10 @@ in
         tag: tagDef:
         let
           dependency = if tagDef.after != null then lib.hm.dag.entryAfter tagDef.after else lib.id;
-          escapeOpensshConfig = builtins.replaceStrings ["%"] ["%%"];
         in
         lib.nameValuePair "tagged-${tag}" {
           match = ''tagged="${tag}"'';
-          proxyCommand = "${lib.getExe pkgs.fc-scripts.ssh-multi-proxy} -v -S ${config.programs.ssh.package}/bin/ssh -p connect${lib.optionalString tagDef.noDirect " -n"} --control-path='${escapeOpensshConfig controlSocket}' -i ${lib.concatStringsSep "," tagDef.connectType}${
+          proxyCommand = "${lib.getExe pkgs.fc-scripts.ssh-multi-proxy} -v -p connect --control-path='${controlDir}'${lib.optionalString tagDef.noDirect " -n"} -i ${lib.concatStringsSep "," tagDef.connectType}${
             lib.optionalString (tagDef.jumpHost != null) " -j ${tagDef.jumpHost}"
           } %h %p";
           extraOptions = {