feature: git: Using delta as difftool
This also enables highlighting in the fzf-fish for git-related searches
This commit is contained in:
parent
ecde3dc29b
commit
6699bf3dcf
2 changed files with 14 additions and 13 deletions
|
|
@ -5,25 +5,22 @@
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
|
|
||||||
[diff]
|
|
||||||
external = difft
|
|
||||||
tool = difftastic
|
|
||||||
|
|
||||||
[difftool]
|
|
||||||
prompt = false
|
|
||||||
|
|
||||||
[difftool "difftastic"]
|
|
||||||
cmd = difft "$LOCAL" "$REMOTE"
|
|
||||||
|
|
||||||
[pager]
|
|
||||||
difftool = true
|
|
||||||
|
|
||||||
[credential]
|
[credential]
|
||||||
helper = cache --timeout=600
|
helper = cache --timeout=600
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = nvim
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
|
pager = delta
|
||||||
|
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
|
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
navigate = true # use n and N to move between diff sections
|
||||||
|
|
||||||
|
[merge]
|
||||||
|
conflictStyle = zdiff3
|
||||||
|
|
|
||||||
4
home.nix
4
home.nix
|
|
@ -40,6 +40,7 @@
|
||||||
fzf
|
fzf
|
||||||
fd
|
fd
|
||||||
bat
|
bat
|
||||||
|
delta
|
||||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||||
# # overrides. You can do that directly here, just don't forget the
|
# # overrides. You can do that directly here, just don't forget the
|
||||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||||
|
|
@ -94,6 +95,9 @@
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
shellInit = ''
|
||||||
|
set fzf_diff_highlighter delta --paging=never --width=20
|
||||||
|
'';
|
||||||
shellInitLast = ''
|
shellInitLast = ''
|
||||||
zoxide init fish | source
|
zoxide init fish | source
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue