schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 2 Pull requests Releases Wiki Activity

home/ssh: fix control socket

Browse source
This commit is contained in:
Trolli Schmittlauch 2026-03-19 12:32:03 +01:00
parent 21606b8db9
commit a0b2f9da99
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
home/modules/ssh.nix
View file

@ -7,7 +7,7 @@
}: }:
let let
inherit (lib) types; inherit (lib) types;
controlDir = "~/.ssh/controlmasters"; controlSocket = "~/.ssh/controlmasters/%r@%n:%p.sock";
proxyTagType = types.submodule ( proxyTagType = types.submodule (
{ name, ... }: { name, ... }:
@ -84,7 +84,7 @@ in
hashKnownHosts = false; hashKnownHosts = false;
userKnownHostsFile = "~/.ssh/known_hosts"; userKnownHostsFile = "~/.ssh/known_hosts";
controlMaster = "no"; controlMaster = "no";
controlPath = "${controlDir}/%r@%n:%p"; controlPath = controlSocket;
controlPersist = "no"; controlPersist = "no";
}; };
} }
@ -96,7 +96,7 @@ in
in in
lib.nameValuePair "tagged-${tag}" { lib.nameValuePair "tagged-${tag}" {
match = ''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}" lib.optionalString (tagDef.jumpHost != null) " -j ${tagDef.jumpHost}"
} %h %p"; } %h %p";
extraOptions = { extraOptions = {