blob: e376fa6d455e2368454a2e1f13b0722c0f2218c0 (
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
|
inputs:
{ config, pkgs, lib, ... }:
{
environment = {
systemPackages = with pkgs; [unstable.git-branchless gitoxide watchman];
shellAliases.git = "git-branchless wrap --";
};
programs.zsh.interactiveShellInit = ''
source ${../../dotfiles/git-branchless.zsh}
'';
home-manager.users.minijackson = { ... }: {
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
userEmail = "minijackson@riseup.net";
userName = "Minijackson";
signing = {
signByDefault = true;
key = "minijackson@riseup.net";
};
extraConfig =
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;
# Use same package as above
# Also, the fact that gitFull depends on Perl
# means that the shebang was fixed
fsmonitor = "${pkgs.gitAndTools.gitFull}/share/git-core/templates/hooks/fsmonitor-watchman.sample";
};
diff = {
colormoved = "default";
colorMovedWS = "allow-indentation-change";
};
pull.ff = "only";
merge = { 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;
};
};
};
};
# TODO: move common to NixOS' programs.git.config
home-manager.users.root = { ... }: {
programs.git = with lib;
# TODO: use `home-manager.sharedModules`?
mkMerge [
(mkDefault config.home-manager.users.minijackson.programs.git)
{
signing = {
signByDefault = false;
key = null;
};
}
];
};
}
|
