summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2025-03-03 13:13:28 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2025-03-03 13:13:28 +0100
commita1827c79f4c3b05c4aef17b51872276112600d38 (patch)
tree3cfa386ef29202d825c999e677645f02422cbcde /users
parent53828bd958ab22522253f2a11772765197351b15 (diff)
downloadnixos-a1827c79f4c3b05c4aef17b51872276112600d38.tar
nixos-a1827c79f4c3b05c4aef17b51872276112600d38.tar.gz
nixos-a1827c79f4c3b05c4aef17b51872276112600d38.tar.bz2
nixos-a1827c79f4c3b05c4aef17b51872276112600d38.tar.xz
nixos-a1827c79f4c3b05c4aef17b51872276112600d38.zip
...
Diffstat (limited to 'users')
-rw-r--r--users/gkleen/default.nix31
-rw-r--r--users/gkleen/gitignore2
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 @@
29 userName = "Gregor Kleen"; 29 userName = "Gregor Kleen";
30 delta.enable = true; 30 delta.enable = true;
31 extraConfig = { 31 extraConfig = {
32 pull.rebase = false; 32 core.excludesfile = toString ./gitignore;
33 pull.rebase = true;
33 submodule.recurse = true; 34 submodule.recurse = true;
34 init.defaultBranch = "main"; 35 init.defaultBranch = "main";
36 column.ui = "auto";
37 branch.sort = "-comitterdate";
38 tag.sort = "version:refname";
39 diff = {
40 algorithm = "histogram";
41 colorMoved = "plain";
42 mnemonicPrefix = true;
43 renames = true;
44 };
45 push = {
46 default = "simple";
47 autoSetupRemote = true;
48 followTags = true;
49 };
50 fetch = {
51 prune = true;
52 pruneTags = true;
53 all = true;
54 };
55 rerere = {
56 enabled = true;
57 autoupdate = true;
58 };
59 rebase = {
60 autoSquash = true;
61 autoStash = true;
62 updateRefs = true;
63 };
35 }; 64 };
36 }; 65 };
37 66
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 @@
1#*#
2.#*