From d5d2e76317bcb0c23a0b6f06f5554b2585b4be97 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 4 Oct 2022 09:36:47 -0600
Subject: [PATCH] all: stop including user configs

---
 users/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/users/default.nix b/users/default.nix
index cc4a491..751a559 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -29,9 +29,6 @@ in {
       extraGroups = [ "wheel" ];
     };
 
-    environment.systemPackages =
-      if isUnstable then [ goVersion pkgs.yash ] else [ goVersion ];
-
     programs.ssh = {
       startAgent = true;
       agentTimeout = "100m";
@@ -41,11 +38,13 @@ in {
         CanonicalizeHostname	always
 
         Host *
-          controlmaster auto
-          controlpath /tmp/ssh-%r@%h:%p
-
-        Include host_config
+          controlmaster         auto
+          controlpath           /tmp/ssh-%r@%h:%p
       '';
     };
+
+    environment.systemPackages =
+      if isUnstable then [ goVersion pkgs.yash ] else [ goVersion ];
+
   };
 }