diff --git a/home/default.nix b/home/default.nix
index 4a3e1af..d20a6b2 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -67,7 +67,10 @@ in {
 
     fzf.enable = true;
 
-    ssh.enable = true;
+    ssh = {
+      enable = true;
+      includes = [ "~/.ssh/config.local" ];
+    };
 
   };
 }
diff --git a/home/git.nix b/home/git.nix
index c7cc174..2f1e048 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -38,7 +38,11 @@
       init.defaultBranch = "main";
     };
     includes = [
-      { path = "~/.gitconfig.local"; }
+      # Always include local gitconfig if it's there
+      {
+        path = "~/.gitconfig.local";
+      }
+      # Include work gitconfig if we're somewhere in ~/work
       {
         path = "~/.gitconfig.work";
         condition = "gitdir:~/work/";