diff --git a/flake.nix b/flake.nix
index a9af343..bfa27dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,7 @@
           mkHome = { user ? "sammy", hostname ? null }:
             lib.homeManagerConfiguration {
               inherit pkgs;
-              modules = [ ./users/${user} ] ++ lib.optional (!isNull hostname) (./. + "/users/${user}@${hostname}");
+              modules = [ ./users/${user}/home.nix ] ++ lib.optional (!isNull hostname) (./. + "/users/${user}@${hostname}/home.nix");
               extraSpecialArgs = {
                 inherit inputs outputs;
                 pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
diff --git a/modules/home/git.nix b/modules/home/git.nix
index 5daa2ec..580d380 100644
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -5,6 +5,7 @@
       init = { defaultBranch = "main"; };
       core = { editor = "nvim"; };
       pull.rebase = true;
+      push.autoSetupRemote = true;
     };
     aliases = {
       a = "add";
diff --git a/users/sammy@chansey/home.nix b/users/sammy@chansey/home.nix
index 01ac48b..20e9b82 100644
--- a/users/sammy@chansey/home.nix
+++ b/users/sammy@chansey/home.nix
@@ -2,4 +2,10 @@
   programs.ssh.includes = [
     "./famedly-config"
   ];
+  programs.git.includes = [
+    {
+      path = "~/famedly/.gitconfig";
+      condition = "gitdir:~/famedly/";
+    }
+  ];
 }