diff --git a/flakes/common/hm_modules/git.nix b/flakes/common/hm_modules/git.nix
index 406d280f..377c9341 100644
--- a/flakes/common/hm_modules/git.nix
+++ b/flakes/common/hm_modules/git.nix
@@ -1,12 +1,20 @@
 { ... }:
 {
+  programs.difftastic = {
+    enable = true;
+    git.enable = true;
+    options = {
+      background = "dark";
+    };
+  };
   programs.git = {
     enable = true;
     # TODO make configurable
-    userEmail = "ringofstorms@gmail.com";
-    userName = "RingOfStorms (Joshua Bell)";
-
-    extraConfig = {
+    settings = {
+      user = {
+        email = "ringofstorms@gmail.com";
+        name = "RingOfStorms (Joshua Bell)";
+      };
       core.pager = "bat";
       core.editor = "nano";
 
@@ -17,11 +25,6 @@
       rerere.enabled = true;
     };
 
-    difftastic = {
-      enable = true;
-      background = "dark";
-    };
-
     ignores = [
       # --------------
       #    Intellij
diff --git a/flakes/common/hm_modules/ssh.nix b/flakes/common/hm_modules/ssh.nix
index e86e3ab8..ade4dc14 100644
--- a/flakes/common/hm_modules/ssh.nix
+++ b/flakes/common/hm_modules/ssh.nix
@@ -20,7 +20,21 @@ in
       Host *
         SetEnv TERM=xterm-256color
     '';
+    enableDefaultConfig = false;
     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";
+      };
+
       # EXTERNAL
       "github.com" = lib.mkIf (hasSecret "nix2github") {
         identityFile = age.secrets.nix2github.path;