Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ssh : fix formatting

Browse source
This commit is contained in:
paki23 2024-04-08 15:06:32 +02:00
parent 9bbbe634d2
commit 3558f96edd
No known key found for this signature in database
GPG key ID: 13160FFB4CEB03F2
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/programs/ssh.nix
View file

@ -537,15 +537,14 @@ in {
home.file.".ssh/config".source = mkIf cfg.internallyManaged cfg.configPath; home.file.".ssh/config".source = mkIf cfg.internallyManaged cfg.configPath;
programs.ssh.configPath = programs.ssh.configPath = let
let
sortedMatchBlocks = hm.dag.topoSort cfg.matchBlocks; sortedMatchBlocks = hm.dag.topoSort cfg.matchBlocks;
sortedMatchBlocksStr = builtins.toJSON sortedMatchBlocks; sortedMatchBlocksStr = builtins.toJSON sortedMatchBlocks;
matchBlocks = matchBlocks = sortedMatchBlocks.result or (abort
sortedMatchBlocks.result or abort "Dependency cycle in SSH match blocks: ${sortedMatchBlocksStr}"; "Dependency cycle in SSH match blocks: ${sortedMatchBlocksStr}");
in pkgs.writeText "ssh_config" '' in pkgs.writeText "ssh_config" ''
${concatStringsSep "\n" ( ${concatStringsSep "\n"
(mapAttrsToList (n: v: "${n} ${v}") cfg.extraOptionOverrides) ((mapAttrsToList (n: v: "${n} ${v}") cfg.extraOptionOverrides)
++ (optional (cfg.includes != [ ]) '' ++ (optional (cfg.includes != [ ]) ''
Include ${concatStringsSep " " cfg.includes} Include ${concatStringsSep " " cfg.includes}
'') ++ (map (block: matchBlockStr block.name block.data) matchBlocks))} '') ++ (map (block: matchBlockStr block.name block.data) matchBlocks))}