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

Compare commits

base: schmittlauch:21606b8db90acd537e064aba2c294351fbd02739
Branches Tags
schmittlauch:mainline
schmittlauch:upgrade-25.11
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
...
compare: schmittlauch:2287685c2cc949054530203827c24cbfcac8b681
Branches Tags
schmittlauch:mainline
schmittlauch:upgrade-25.11
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

2 commits
21606b8db9 ... 2287685c2c

Author SHA1 Message Date
Trolli Schmittlauch
2287685c2c home/ssh: use %C for control socket paths 2026-03-19 20:20:46 +01:00
Trolli Schmittlauch
a0b2f9da99 home/ssh: fix control socket 2026-03-19 12:42:34 +01:00
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
home/modules/ssh.nix
View file

@ -7,7 +7,7 @@
}:
let
inherit (lib) types;
controlDir = "~/.ssh/controlmasters";
controlSocket = "~/.ssh/controlmasters/%C.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";
};
}
@ -93,10 +93,11 @@ 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 -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 -S ${config.programs.ssh.package}/bin/ssh -p connect${lib.optionalString tagDef.noDirect " -n"} --control-path='${escapeOpensshConfig controlSocket}' -i ${lib.concatStringsSep "," tagDef.connectType}${
lib.optionalString (tagDef.jumpHost != null) " -j ${tagDef.jumpHost}"
} %h %p";
extraOptions = {