2 files changed, 80 insertions, 30 deletions

diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix
index 4ddf4be3..b3b49949 100644
--- a/users/gkleen/default.nix
+++ b/users/gkleen/default.nix
@@ -1,7 +1,9 @@
-{ flake, userName, pkgs, customUtils, lib, ... }:
-{
+{ flake, home-manager, userName, pkgs, customUtils, lib, ... }:
+let
+  homeManagerRelease = lib.importJSON (home-manager + /release.json);
+in {
   imports = with flake.nixosModules.userProfiles.${userName}; [
-    zsh tmux utils direnv
+    utils direnv
   ];
 
   users.users.${userName} = {
@@ -15,39 +17,85 @@
     hashedPassword = "$6$rounds=500000$dOMgCU7DAk$yQFYGOURTEt12387LIYBnFKSWmtwXMUk1LJWnV0m7OFt.y2TnxQn2abdGA5dhwG9EmMB5wZGXf4J5F71c746C/";
   };
 
-  home-manager.users.${userName} = {
-    home.keyboard = {
-      layout = "us";
-      variant = "dvp";
-      options = [ "ctl:nocaps" "compose:caps" ];
-    };
+  home-manager.users.${userName} = { config, ... }: lib.foldr lib.recursiveUpdate {} ([
+    {
+      home.keyboard = {
+        layout = "us";
+        variant = "dvp";
+        options = [ "ctl:nocaps" "compose:caps" ];
+      };
+
+      programs = {
+        git.enable = true;
 
+        ssh.enable = true;
+
+        gpg.enable = true;
+      };
+    }
+  ] ++ (lib.optional (lib.versionAtLeast homeManagerRelease.release "25.11") {
     programs = {
-      git = {
-        enable = true;
-        userEmail = "gkleen@yggdrasil.li";
-        userName = "Gregor Kleen";
-        delta.enable = true;
-        extraConfig = {
-          pull.rebase = false;
-          submodule.recurse = true;
-          init.defaultBranch = "main";
+      git.settings = {
+        user = {
+          email = "gkleen@yggdrasil.li";
+          name = "Gregor Kleen";
+        };
+        core.excludesfile = toString ./gitignore;
+        pull.rebase = true;
+        submodule.recurse = true;
+        init.defaultBranch = "main";
+        column.ui = "auto";
+        branch.sort = "-committerdate";
+        tag.sort = "version:refname";
+        diff = {
+          algorithm = "histogram";
+          colorMoved = "plain";
+          mnemonicPrefix = true;
+          renames = true;
+        };
+        push = {
+          default = "simple";
+          autoSetupRemote = true;
+          followTags = true;
+        };
+        fetch = {
+          prune = true;
+          pruneTags = true;
+          all = true;
         };
+        rerere = {
+          enabled = true;
+          autoupdate = true;
+        };
+        rebase = {
+          autoSquash = true;
+          autoStash = true;
+          updateRefs = true;
+        };
+        merge.conflictstyle = "zdiff3";
       };
-
-      ssh = {
+      delta = {
         enable = true;
-        controlMaster = "auto";
-        controlPersist = "30m";
-        serverAliveInterval = 6;
-        serverAliveCountMax = 10;
-        hashKnownHosts = true;
-        extraConfig = ''
-          IdentitiesOnly true
-        '';
+        enableGitIntegration = true;
       };
+      ssh = {
+        enableDefaultConfig = false;
+        matchBlocks."*" = {
+          forwardAgent = false;
+          addKeysToAgent = "no";
+          compression = false;
+          userKnownHostsFile = "~/.ssh/known_hosts";
 
-      gpg.enable = true;
+          # controlMaster = "auto";
+          # controlPersist = "30m";
+          # controlPath = "~/.ssh/master-%r@%n:%p";
+
+          serverAliveInterval = 6;
+          serverAliveCountMax = 10;
+          hashKnownHosts = true;
+          identitiesOnly = true;
+        };
+      };
     };
-  };
+  }));
 }
diff --git a/users/gkleen/gitignore b/users/gkleen/gitignore
new file mode 100644
index 00000000..f7082b20
--- /dev/null
+++ b/users/gkleen/gitignore
@@ -0,0 +1,2 @@
+**/#*#
+**/.#*