From a0b2f9da99f96de8d3106342ff6df5c1b2f3a0bf Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Thu, 19 Mar 2026 12:32:03 +0100
Subject: [PATCH] home/ssh: fix control socket

---
 home/modules/ssh.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/home/modules/ssh.nix b/home/modules/ssh.nix
index 3301bbb..2a4e173 100644
--- a/home/modules/ssh.nix
+++ b/home/modules/ssh.nix
@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) types;
-  controlDir = "~/.ssh/controlmasters";
+  controlSocket = "~/.ssh/controlmasters/%r@%n:%p.sock";
 
   proxyTagType = types.submodule (
     { name, ... }:
@@ -84,7 +84,7 @@ in
           hashKnownHosts = false;
           userKnownHostsFile = "~/.ssh/known_hosts";
           controlMaster = "no";
-          controlPath = "${controlDir}/%r@%n:%p";
+          controlPath = controlSocket;
           controlPersist = "no";
         };
       }
@@ -96,7 +96,7 @@ in
         in
         lib.nameValuePair "tagged-${tag}" {
           match = ''tagged="${tag}"'';
-          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}${
+          proxyCommand = "${lib.getExe pkgs.fc-scripts.ssh-multi-proxy} -v -p connect --control-path='${controlSocket}'${lib.optionalString tagDef.noDirect " -n"} -i ${lib.concatStringsSep "," tagDef.connectType}${
             lib.optionalString (tagDef.jumpHost != null) " -j ${tagDef.jumpHost}"
           } %h %p";
           extraOptions = {