feat(git): misc config updates + tig -> gitui

This commit is contained in:
Pierre Martin
2023-06-14 06:12:43 +02:00
parent bd49a508c5
commit 799a42082d
2 changed files with 7 additions and 6 deletions

View File

@@ -56,7 +56,6 @@
fzf fzf
bat bat
bat-extras.prettybat bat-extras.prettybat
delta
atool atool
unzip unzip
@@ -78,7 +77,6 @@
udiskie udiskie
tldr tldr
gitAndTools.tig
git-filter-repo git-filter-repo
meld meld
glab glab

View File

@@ -1,10 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.gitui.enable = true;
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;
# TODO: https://www.imagile.fr/utiliser-automatiquement-plusieurs-identites-sur-git/
userEmail = "pierre@front-commerce.com"; userEmail = "pierre@front-commerce.com";
userName = "Pierre Martin"; userName = "Pierre Martin";
@@ -25,11 +27,9 @@
".vscode" ".vscode"
]; ];
extraConfig = {
# see https://github.com/dandavison/delta#get-started # see https://github.com/dandavison/delta#get-started
core.pager = "delta"; delta.enable = true;
interactive.diffFilter = "delta --color-only"; extraConfig = {
delta.navigate = true;
merge.conflictstyle = "diff3"; merge.conflictstyle = "diff3";
diff.colorMoved = "default"; diff.colorMoved = "default";
@@ -46,6 +46,9 @@
# see https://michaelheap.com/git-ignore-rev/ # see https://michaelheap.com/git-ignore-rev/
blame.ignoreRevsFile = ".git-blame-ignore-revs"; blame.ignoreRevsFile = ".git-blame-ignore-revs";
# see https://adamj.eu/tech/2022/10/15/how-to-rebase-stacked-git-branches/
rebase.updateRefs = true;
}; };
}; };
} }