blob: 463b5645d30f70a6d6f927dcddf8341761edebba (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
{ config
, pkgs
, ...
}: {
programs.git = {
enable = true;
userName = "Alan Pearce";
userEmail = "alan@alanpearce.eu";
delta = {
enable = true;
options = {
navigate = true;
light = true;
};
};
extraConfig = {
init = {
defaultBranch = "main";
};
advice = {
addEmptyPathspec = false;
mergeConflict = false;
};
ghq = {
root = "${config.home.homeDirectory}/projects";
user = "alanpearce";
};
core = {
commitGraph = true;
};
pull = {
rebase = true;
};
push = {
default = "current";
followTags = true;
};
rebase = {
autosquash = true;
};
rerere = {
enable = true;
};
merge = {
conflictStyle = "diff3";
};
diff = {
algorithm = "patience";
colorMoved = "default";
};
remote = {
autoSetupMerge = true;
};
"branch.master" = {
rebase = false;
};
"branch.main" = {
rebase = false;
};
};
signing = {
key = "0xCD4BEB92A8D46583";
};
lfs = {
enable = true;
};
aliases = {
authors = "shortlog -s -n";
mup = "merge FETCH_HEAD";
rup = "rebase FETCH_HEAD";
ls = "ls-files";
st = "status -sb";
ci = "commit";
br = "branch";
co = "checkout";
sw = "switch";
rs = "restore";
lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\\\?[0-9]\" | tail -n1'";
pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'";
lg = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'";
prl = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset' --grep='#'";
gen-ignore = "ignore-io";
ignored = "ls-files --others -i --exclude-standard";
clear = "clear-soft";
clear-hard = "!git-clear-hard";
};
ignores = [
".DS_Store"
"*_flymake.*"
"*~"
"\#*\#"
".\#*"
".tabnine_root"
];
};
programs.gh = {
enable = true;
settings = {
git_protocol = "ssh";
aliases = {
fork = "repo fork --remote --remote-name alanpearce --default-branch-only";
};
};
};
home.packages = with pkgs; [
git-extras # delete-merged-branches and friends
ghq
delta
gitui
gitstatus
hut # sourcehut tools
];
}
|