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

use delta for git diff

This commit is contained in:
Cyryl Płotnicki 2020-10-17 13:37:33 +01:00
parent afa205b1d2
commit 68a6af07a0
3 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.gitconfig.linux.private
View File

@ -1,9 +1,20 @@
[include] [include]
path = dev/dotfiles/.gitconfig_includes.common path = dev/dotfiles/.gitconfig_includes.common
path = dev/dotfiles/.gitconfig_includes.linux path = dev/dotfiles/.gitconfig_includes.linux
[alias] [alias]
signedcommit = !git commit -S signedcommit = !git commit -S
[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

8
nixos/git/home.nix
View File

@ -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 =
{ {

43
nixos/home-manager/programs/kitty.nix
View File

@ -12,27 +12,28 @@
bold_font = "auto"; bold_font = "auto";
italic_font = "auto"; italic_font = "auto";
bold_italic_font = "auto"; bold_italic_font = "auto";
background = "#001e26"; background = "#001e26";
foreground = "#708183"; foreground = "#708183";
cursor = "#708183"; selection_foreground ="#001e26";
selection_background = "#002731"; selection_background = "#002731";
color0 = "#002731"; cursor = "#708183";
color8 = "#465a61";
color1 = "#d01b24"; color0 = "#002731";
color9 = "#bd3612"; color1 = "#d01b24";
color2 = "#728905"; color2 = "#728905";
color10 = "#465a61"; color3 = "#a57705";
color3 = "#a57705"; color4 = "#2075c7";
color11 = "#52676f"; color5 = "#c61b6e";
color4 = "#2075c7"; color6 = "#259185";
color12 = "#708183"; color7 = "#e9e2cb";
color5 = "#c61b6e"; color8 = "#001e26";
color13 = "#5856b9"; color9 = "#bd3612";
color6 = "#259185"; color10 = "#465a61";
color14 = "#81908f"; color11 = "#52676f";
color7 = "#e9e2cb"; color12 = "#708183";
color15 = "#fcf4dc"; color13 = "#5856b9";
selection_foreground = "#001e26"; color14 = "#81908f";
color15 = "#fcf4dc";
}; };
}; };