diff --git a/system/users/nathan/home-manager/programs/git/default.nix b/system/users/nathan/home-manager/programs/git/default.nix index a263fd1..5aa9bd2 100644 --- a/system/users/nathan/home-manager/programs/git/default.nix +++ b/system/users/nathan/home-manager/programs/git/default.nix @@ -27,7 +27,7 @@ { path = "${config.sops.templates.gitconfig.path}"; } ]; - extraConfig = { + settings = { init = { defaultBranch = "master"; }; diff --git a/system/users/nathan/home-manager/programs/terminal/ssh/default.nix b/system/users/nathan/home-manager/programs/terminal/ssh/default.nix index 3a9c962..6d6ff7d 100644 --- a/system/users/nathan/home-manager/programs/terminal/ssh/default.nix +++ b/system/users/nathan/home-manager/programs/terminal/ssh/default.nix @@ -1,8 +1,23 @@ -{ config, lib, pkgs, ... }: { +{ ... }: { programs.ssh = { enable = true; + # defaults as of 25.11 + matchBlocks."*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; + + }; }