pierre/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: configurer delta comme pager git

Browse Source 
Active delta avec navigate=true et dark=true.
Met à jour merge.conflictstyle en zdiff3.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Pierre Martin
2026-03-12 12:35:41 +01:00
parent cee4d3ea51
commit 89910a16b9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
programs/git.nix
View File

@@ -23,11 +23,13 @@
"CLAUDE.local.md" "CLAUDE.local.md"
]; ];
# see https://github.com/dandavison/delta#get-started delta = {
#delta.enable = true; enable = true;
# TEMPORARY DEACTIVATED due to the error options = {
# error[E0282]: type annotations needed for `Box<_>` navigate = true;
# --> /build/delta-0.17.0-vendor.tar.gz/time/src/format_description/parse/mod.rs:83:9 dark = true;
};
};
settings = { settings = {
alias = { alias = {
@@ -41,7 +43,7 @@
name = "Pierre Martin"; name = "Pierre Martin";
}; };
merge.conflictstyle = "diff3"; merge.conflictstyle = "zdiff3";
diff.colorMoved = "default"; diff.colorMoved = "default";
merge.tool = "meld"; merge.tool = "meld";