add config for delta
This commit is contained in:
parent
6bb2c60c39
commit
821e72b99c
1 changed files with 50 additions and 6 deletions
|
@ -9,12 +9,6 @@
|
||||||
recurse = true
|
recurse = true
|
||||||
[credential]
|
[credential]
|
||||||
helper = store
|
helper = store
|
||||||
[core]
|
|
||||||
editor = nvim
|
|
||||||
excludesfile = ~/.config/git/excludes
|
|
||||||
whitespace = tab-in-indent
|
|
||||||
[merge]
|
|
||||||
tool = nvimdiff1
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
[include]
|
[include]
|
||||||
|
@ -24,3 +18,53 @@
|
||||||
smudge = git-lfs smudge -- %f
|
smudge = git-lfs smudge -- %f
|
||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
required = true
|
required = true
|
||||||
|
[diff]
|
||||||
|
colorMoved = default
|
||||||
|
[core]
|
||||||
|
editor = nvim
|
||||||
|
pager = delta --dark --paging=never --config $XDG_CONFIG_HOME/git/config
|
||||||
|
excludesfile = ~/.config/git/excludes
|
||||||
|
whitespace = tab-in-indent
|
||||||
|
[merge]
|
||||||
|
conflictstyle = diff3
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only --features=interactive
|
||||||
|
[delta]
|
||||||
|
dark = true
|
||||||
|
line-numbers = true
|
||||||
|
; side-by-side = true
|
||||||
|
keep-plus-minus-markers = false
|
||||||
|
syntax-theme = base16
|
||||||
|
file-style = "#414868" bold
|
||||||
|
file-decoration-style = "#414868" ul
|
||||||
|
file-added-label = [+]
|
||||||
|
file-copied-label = [==]
|
||||||
|
file-modified-label = [*]
|
||||||
|
file-removed-label = [-]
|
||||||
|
file-renamed-label = [->]
|
||||||
|
hunk-header-style = omit
|
||||||
|
line-numbers-left-format = "{nm:>3}"
|
||||||
|
line-numbers-left-style = "#b2555b"
|
||||||
|
line-numbers-right-format = "{np:>3} "
|
||||||
|
line-numbers-right-style = "#41a6b5"
|
||||||
|
line-numbers-minus-style = "#b2555b" italic
|
||||||
|
line-numbers-plus-style = "#41a6b5" italic
|
||||||
|
line-numbers-zero-style = "#414868" italic
|
||||||
|
minus-style = bold syntax "#914c54"
|
||||||
|
minus-emph-style = bold syntax "#b2555b"
|
||||||
|
minus-non-emph-style = bold syntax "#914c54"
|
||||||
|
plus-style = bold syntax "#266d6a"
|
||||||
|
plus-emph-style = bold syntax "#449dab"
|
||||||
|
plus-non-emph-style = bold syntax "#266d6a"
|
||||||
|
zero-style = syntax
|
||||||
|
blame-code-style = syntax
|
||||||
|
blame-format = "{author:<18} ({commit:>9}) {timestamp:^16}"
|
||||||
|
blame-palette = "#24283b" "#3b4261" "#414868" "#545c7e"
|
||||||
|
merge-conflict-begin-symbol = ~
|
||||||
|
merge-conflict-end-symbol = ~
|
||||||
|
merge-conflict-ours-diff-header-style = "#ffc777" bold
|
||||||
|
merge-conflict-ours-diff-header-decoration-style = "#414868" box
|
||||||
|
merge-conflict-theirs-diff-header-style = "#ffc777" bold
|
||||||
|
merge-conflict-theirs-diff-header-decoration-style = "#414868" box
|
||||||
|
[delta "interactive"]
|
||||||
|
keep-plus-minus-markers = false
|
||||||
|
|
Loading…
Add table
Reference in a new issue