blob: 2a2abcf526282198e476c2d3a38e731b03f375d5 (
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
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
_inputs:
{ config, pkgs, ... }:
{
home-manager.sharedModules = [
{
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
userEmail = "minijackson@riseup.net";
userName = "Minijackson";
attributes = [
"*.cc diff=cpp"
"*.cpp diff=cpp"
"*.css diff=css"
"*.ex diff=elixir"
"*.exs diff=elixir"
"*.go diff=golang"
"*.html diff=html"
"*.java diff=java"
"*.md diff=markdown"
"*.php diff=php"
"*.pl diff=perl"
"*.py diff=python"
"*.rs diff=rust"
"*.tex diff=latex"
];
iniContent =
let
deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
in
{
init.defaultBranch = "master";
core = {
whitespace = "trailing-space,space-before-tab";
pager = deltaCommand;
interactive.diffFilter = "${deltaCommand} --color-only";
untrackedCache = true;
};
diff = {
algorithm = "histogram";
colormoved = "default";
colorMovedWS = "allow-indentation-change";
};
pull.ff = "only";
rerere.enable = true;
merge = {
conflictStyle = "zdiff3";
tool = "nvimdiff";
};
"mergetool \"nvimdiff\"" = {
cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";
};
delta = with config.theme.colors; {
line-numbers = true;
navigate = true;
whitespace-error-style = "reverse green";
minus-style = "normal red";
minus-non-emph-style = "normal red";
minus-emph-style = "normal brightred";
minus-empty-line-marker-style = "normal red";
plus-style = "reverse green";
plus-non-emph-style = "reverse green";
plus-emph-style = "reverse brightgreen";
plus-empty-line-marker-style = "reverse green";
line-numbers-minus-style = "brightred";
line-numbers-zero-style = "brightblack";
line-numbers-plus-style = "brightgreen";
file-style = "bright${dominantName}";
line-numbers-left-style = dominantName;
line-numbers-right-style = dominantName;
};
};
};
}
];
users.extraUsers.minijackson.packages = [
pkgs.watchman
];
# TODO: move common to NixOS' programs.git.config
home-manager.users.minijackson.programs = {
git.signing = {
signByDefault = true;
key = "minijackson@riseup.net";
};
jujutsu = {
enable = true;
package = pkgs.unstable.jujutsu;
settings = {
core.fsmonitor = "watchman";
git.private-commits = "description(glob:'wip:*') | description(glob:'private:*')";
merge-tools = {
difft.diff-args = [
"--color=always"
"--sort-paths"
"$left"
"$right"
];
nvim = {
diff-args = [ "-d" ];
diff-invocation-mode = "file-by-file";
merge-args = [
"-f"
"-d"
"$output"
"-M"
"$left"
"$base"
"$right"
"-c"
"wincmd J"
"-c"
"set modifiable"
"-c"
"set write"
];
merge-tool-edits-conflict-markers = true;
};
};
ui = {
default-command = [ "log" ];
# TODO: setup hunk.nvim as diff-editor
# diff-editor = "nvim";
diff.tool = "difft";
merge-editor = "nvim";
};
signing = {
sign-all = true;
backend = "gpg";
key = "minijackson@riseup.net";
};
user = {
email = "minijackson@riseup.net";
name = "Minijackson";
};
};
};
};
}
|
