some more work laptop things

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"; };

modules/home/git.nix

@@ -5,6 +5,7 @@
       init = { defaultBranch = "main"; };
       core = { editor = "nvim"; };
       pull.rebase = true;
+      push.autoSetupRemote = true;
     };
     aliases = {
       a = "add";

users/sammy@chansey/home.nix

@@ -2,4 +2,10 @@
   programs.ssh.includes = [
     "./famedly-config"
   ];
+  programs.git.includes = [
+    {
+      path = "~/famedly/.gitconfig";
+      condition = "gitdir:~/famedly/";
+    }
+  ];
 }