use delta for git diff
This commit is contained in:
parent
afa205b1d2
commit
68a6af07a0
3 changed files with 40 additions and 30 deletions
|
@ -7,3 +7,14 @@
|
||||||
|
|
||||||
[gpg]
|
[gpg]
|
||||||
program = gpg2
|
program = gpg2
|
||||||
|
|
||||||
|
[diff]
|
||||||
|
tool = kitty
|
||||||
|
guitool = kitty.gui
|
||||||
|
[difftool]
|
||||||
|
prompt = false
|
||||||
|
trustExitCode = true
|
||||||
|
[difftool "kitty"]
|
||||||
|
cmd = kitty +kitten diff $LOCAL $REMOTE
|
||||||
|
[difftool "kitty.gui"]
|
||||||
|
cmd = kitty kitty +kitten diff $LOCAL $REMOTE
|
||||||
|
|
|
@ -5,17 +5,15 @@
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
userName = "Cyryl Płotnicki";
|
userName = "Cyryl Płotnicki";
|
||||||
userEmail = "cyplo@cyplo.net";
|
userEmail = "cyplo@cyplo.net";
|
||||||
|
delta = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
credential = { helper ="cache"; };
|
credential = { helper ="cache"; };
|
||||||
core = { pager = "cat"; };
|
|
||||||
colour.ui = true;
|
colour.ui = true;
|
||||||
help.autocorrect = 1;
|
help.autocorrect = 1;
|
||||||
push.default = "simple";
|
push.default = "simple";
|
||||||
mergetool.keepBackup = false;
|
mergetool.keepBackup = false;
|
||||||
pager = {
|
|
||||||
diff = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
|
|
||||||
show = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
aliases =
|
aliases =
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,25 +14,26 @@
|
||||||
bold_italic_font = "auto";
|
bold_italic_font = "auto";
|
||||||
background = "#001e26";
|
background = "#001e26";
|
||||||
foreground = "#708183";
|
foreground = "#708183";
|
||||||
cursor = "#708183";
|
|
||||||
selection_background = "#002731";
|
|
||||||
color0 = "#002731";
|
|
||||||
color8 = "#465a61";
|
|
||||||
color1 = "#d01b24";
|
|
||||||
color9 = "#bd3612";
|
|
||||||
color2 = "#728905";
|
|
||||||
color10 = "#465a61";
|
|
||||||
color3 = "#a57705";
|
|
||||||
color11 = "#52676f";
|
|
||||||
color4 = "#2075c7";
|
|
||||||
color12 = "#708183";
|
|
||||||
color5 = "#c61b6e";
|
|
||||||
color13 = "#5856b9";
|
|
||||||
color6 = "#259185";
|
|
||||||
color14 = "#81908f";
|
|
||||||
color7 = "#e9e2cb";
|
|
||||||
color15 = "#fcf4dc";
|
|
||||||
selection_foreground ="#001e26";
|
selection_foreground ="#001e26";
|
||||||
|
selection_background = "#002731";
|
||||||
|
cursor = "#708183";
|
||||||
|
|
||||||
|
color0 = "#002731";
|
||||||
|
color1 = "#d01b24";
|
||||||
|
color2 = "#728905";
|
||||||
|
color3 = "#a57705";
|
||||||
|
color4 = "#2075c7";
|
||||||
|
color5 = "#c61b6e";
|
||||||
|
color6 = "#259185";
|
||||||
|
color7 = "#e9e2cb";
|
||||||
|
color8 = "#001e26";
|
||||||
|
color9 = "#bd3612";
|
||||||
|
color10 = "#465a61";
|
||||||
|
color11 = "#52676f";
|
||||||
|
color12 = "#708183";
|
||||||
|
color13 = "#5856b9";
|
||||||
|
color14 = "#81908f";
|
||||||
|
color15 = "#fcf4dc";
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue