all: consolidate ssh_config settings

This commit is contained in:
Aaron Bieber 2023-03-06 08:30:43 -07:00
parent 935f1ae22c
commit f132365414
No known key found for this signature in database
2 changed files with 10 additions and 15 deletions

View File

@ -195,7 +195,16 @@ in {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkbSJWeWJyJjak/boaMTqzPVq91wfJz1P+I4rnBUsPW"; "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkbSJWeWJyJjak/boaMTqzPVq91wfJz1P+I4rnBUsPW";
}; };
startAgent = true; startAgent = true;
extraConfig = ""; extraConfig = ''
agentTimeout = "100m";
VerifyHostKeyDNS yes
AddKeysToAgent confirm 90m
CanonicalizeHostname always
Host *
controlmaster auto
controlpath /tmp/ssh-%r@%h:%p
'';
}; };
}; };

View File

@ -29,20 +29,6 @@ in {
extraGroups = [ "wheel" ]; extraGroups = [ "wheel" ];
}; };
programs.ssh = {
startAgent = true;
agentTimeout = "100m";
extraConfig = ''
VerifyHostKeyDNS yes
AddKeysToAgent confirm 90m
CanonicalizeHostname always
Host *
controlmaster auto
controlpath /tmp/ssh-%r@%h:%p
'';
};
environment.systemPackages = environment.systemPackages =
if isUnstable then [ pkgs.yash pkgs.go ] else [ pkgs.go ]; if isUnstable then [ pkgs.yash pkgs.go ] else [ pkgs.go ];
}; };