96 lines
1.7 KiB
Nix
96 lines
1.7 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}: {
|
|
programs.git = {
|
|
enable = true;
|
|
# Don't use difftastic on git-diff by default
|
|
# it makes distributing patches difficult
|
|
#
|
|
# Instead use difftastic as a difftool
|
|
difftastic.enable = false;
|
|
|
|
userName = "Anthony Cicchetti";
|
|
userEmail = "anthony@anthonycicchetti.com";
|
|
|
|
aliases = {
|
|
pushall = "!git remote | xargs -L1 git push --all";
|
|
pr = "!f() { git fetch -fu $${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f";
|
|
logp = "log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short";
|
|
difft = "difftool";
|
|
};
|
|
|
|
extraConfig = {
|
|
core = {
|
|
autocrlf = "input";
|
|
fsmonitor = true;
|
|
};
|
|
|
|
checkout = {
|
|
workers = 0;
|
|
};
|
|
|
|
diff = {
|
|
tool = "difftastic";
|
|
algorithm = "histogram";
|
|
};
|
|
|
|
difftool = {
|
|
prompt = false;
|
|
difftastic = {
|
|
cmd = "${pkgs.difftastic}/bin/difft --color auto --background light --display side-by-side \"$LOCAL\" \"$REMOTE\"";
|
|
};
|
|
};
|
|
|
|
fetch = {
|
|
prune = true;
|
|
};
|
|
|
|
format = {
|
|
pretty = "fuller";
|
|
};
|
|
|
|
help = {
|
|
autoCorrect = "prompt";
|
|
};
|
|
|
|
init = {
|
|
defaultBranch = "main";
|
|
};
|
|
|
|
log = {
|
|
follow = true;
|
|
};
|
|
|
|
merge = {
|
|
conflictStyle = "zdiff3";
|
|
};
|
|
|
|
push = {
|
|
autoSetupRemote = true;
|
|
};
|
|
|
|
pull = {
|
|
rebase = true;
|
|
};
|
|
|
|
rebase = {
|
|
updateRefs = true;
|
|
};
|
|
|
|
rerere = {
|
|
enabled = true;
|
|
};
|
|
|
|
submodule = {
|
|
recurse = true;
|
|
};
|
|
};
|
|
|
|
includes = [
|
|
{path = "~/.gitconfig_local";}
|
|
];
|
|
};
|
|
}
|