dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

Added even more git options

Browse source
This commit is contained in:
Tim Schubert 2022-01-30 16:27:29 +01:00
parent dfe9de1d0f
commit 62304d38da
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
1 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
home/modules/git.nix
View file

@ -16,17 +16,11 @@ in
tab-in-indent = true; tab-in-indent = true;
tabwidth = 4; tabwidth = 4;
}; };
alias = { alias = { };
};
pager = "delta"; pager = "delta";
}; };
column = { column.ui = "never";
ui = "never"; checkout.defaultRemote = "origin";
};
checkout = {
defaultRemote = "origin";
};
delta = { delta = {
navigate = true; # use n and N to move between diff sections navigate = true; # use n and N to move between diff sections
side-by-side = false; side-by-side = false;
@ -37,26 +31,24 @@ in
algorithm = "histogram"; algorithm = "histogram";
colorMoved = "default"; colorMoved = "default";
}; };
interactive = { interactive.diffFilter = "delta --color-only";
diffFilter = "delta --color-only"; merge.conflictstyle = "diff3";
};
merge = {
conflictstyle = "diff3";
};
status = { status = {
short = true; short = true;
branch = true; branch = true;
showUntrackedFiled = "all"; showUntrackedFiled = "all";
}; };
commit = { commit.verbose = true;
verbose = true; log.date = "iso8601-local";
}; tag.gpgSign = true;
log = {
date = "iso8601-local";
};
pull = { pull = {
prune = true; prune = true;
ff = "only";
rebase = "interactive";
}; };
push.default = "upstream";
rebase.abbreviateCommands = true;
rerere.enabled = true;
}; };
}; };