From f13236541412c06d5d90de6725bf0ec4bd1df539 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 6 Mar 2023 08:30:43 -0700
Subject: [PATCH] all: consolidate ssh_config settings

---
 default.nix       | 11 ++++++++++-
 users/default.nix | 14 --------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/default.nix b/default.nix
index 22d8b7b..eacd9a9 100644
--- a/default.nix
+++ b/default.nix
@@ -195,7 +195,16 @@ in {
             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkbSJWeWJyJjak/boaMTqzPVq91wfJz1P+I4rnBUsPW";
         };
         startAgent = true;
-        extraConfig = "";
+        extraConfig = ''
+          agentTimeout = "100m";
+            VerifyHostKeyDNS	yes
+            AddKeysToAgent		confirm 90m
+            CanonicalizeHostname	always
+
+            Host *
+              controlmaster         auto
+              controlpath           /tmp/ssh-%r@%h:%p
+        '';
       };
     };
 
diff --git a/users/default.nix b/users/default.nix
index 9ff38c2..3c0fe0d 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -29,20 +29,6 @@ in {
       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 =
       if isUnstable then [ pkgs.yash pkgs.go ] else [ pkgs.go ];
   };