mira/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update gitconfig, nvim plugins

Browse source
This commit is contained in:
Mira 2024-02-29 10:33:35 -05:00
parent 08894a100e
commit 62608e0130
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AppData/Local/external_nvim

@ -1 +1 @@
Subproject commit 154001034d30fe85b56b71deb90d9fa466fbddda Subproject commit 23c86b37763f3662b40cbce638bacc8791894c41

10
private_dot_config/git/executable_config.tmpl
View file

@ -5,6 +5,7 @@ name = {{ .name | quote }}
[core] [core]
editor = nvim editor = nvim
pager = delta pager = delta
difftool = true
# Remove Carriage Returns # Remove Carriage Returns
autocrlf = input autocrlf = input
eol = lf eol = lf
@ -16,8 +17,15 @@ diffFilter = delta --color-only
navigate = true # use n and N to move between diff sections navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
[diff]
tool = difftastic
[difftool "difftastic"]
prompt = false
[merge] [merge]
conflictstyle = diff3 # TODO: set this to meld or nvimdiff
conflictstyle = zdiff3
[diff] [diff]
colorMoved = default colorMoved = default