Skip to content

Commit 954afc7

Browse files
committed
fix: broken git config
1 parent 0fe66c3 commit 954afc7

File tree

1 file changed

+31
-33
lines changed

1 file changed

+31
-33
lines changed

modules/home/programs/cli/git.nix

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,39 @@
88
user = {
99
email = "arnaud.rebts@gmail.com";
1010
name = "Arnaud Rebts";
11+
signingkey = "~/.ssh/id_ed25519.pub";
1112
};
1213

14+
fetch = {
15+
prune = true;
16+
};
17+
push = {
18+
default = "simple";
19+
followTags = true;
20+
autoSetupRemote = true;
21+
};
22+
pull = {
23+
rebase = true;
24+
};
25+
merge = {
26+
ff = "only";
27+
};
28+
mergetool = {
29+
keepBackup = false;
30+
};
31+
rebase = {
32+
autosquash = true;
33+
};
34+
rerere = {
35+
enabled = true;
36+
};
37+
init = {
38+
defaultBranch = "main";
39+
};
40+
gpg.format = "ssh";
41+
commit.gpgsign = true;
42+
tag.gpgsign = true;
43+
1344
aliases = {
1445
co = "checkout";
1546
br = "branch";
@@ -22,39 +53,6 @@
2253
st = "status -s";
2354
diffn = "diff --no-ext-diff";
2455
};
25-
26-
extraConfig = {
27-
fetch = {
28-
prune = true;
29-
};
30-
push = {
31-
default = "simple";
32-
followTags = true;
33-
autoSetupRemote = true;
34-
};
35-
pull = {
36-
rebase = true;
37-
};
38-
merge = {
39-
ff = "only";
40-
};
41-
mergetool = {
42-
keepBackup = false;
43-
};
44-
rebase = {
45-
autosquash = true;
46-
};
47-
rerere = {
48-
enabled = true;
49-
};
50-
init = {
51-
defaultBranch = "main";
52-
};
53-
user.signingkey = "~/.ssh/id_ed25519.pub";
54-
gpg.format = "ssh";
55-
commit.gpgsign = true;
56-
tag.gpgsign = true;
57-
};
5856
};
5957
};
6058
}

0 commit comments

Comments
 (0)