2 files changed, 32 insertions, 1 deletions

diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix
index 4ddf4be3..074d4866 100644
--- a/users/gkleen/default.nix
+++ b/users/gkleen/default.nix
@@ -29,9 +29,38 @@
         userName = "Gregor Kleen";
         delta.enable = true;
         extraConfig = {
-          pull.rebase = false;
+          core.excludesfile = toString ./gitignore;
+          pull.rebase = true;
           submodule.recurse = true;
           init.defaultBranch = "main";
+          column.ui = "auto";
+          branch.sort = "-comitterdate";
+          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;
+          };
         };
       };
 
diff --git a/users/gkleen/gitignore b/users/gkleen/gitignore
new file mode 100644
index 00000000..8a1ee70a
--- /dev/null
+++ b/users/gkleen/gitignore
@@ -0,0 +1,2 @@
+#*#
+.#*