Update how nvim handles diffs
This commit is contained in:
parent
f8dea52374
commit
b42bdfdf74
@ -16,7 +16,7 @@
|
|||||||
detachedHead = true
|
detachedHead = true
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
authors = shortlog --summary --numbered --email
|
authors = shortlog --summary --numbered --email
|
||||||
|
|
||||||
[filter "lfs"]
|
[filter "lfs"]
|
||||||
clean = git-lfs clean -- %f
|
clean = git-lfs clean -- %f
|
||||||
|
@ -70,10 +70,19 @@ if !exists('g:vscode')
|
|||||||
hi clear SpellCap
|
hi clear SpellCap
|
||||||
hi clear SpellRare
|
hi clear SpellRare
|
||||||
|
|
||||||
" Disable spellcheck for manpages
|
" Disable spellcheck for some file formats
|
||||||
autocmd FileType man setlocal nospell
|
autocmd FileType man setlocal nospell
|
||||||
|
autocmd FileType diff setlocal nospell
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
" Configure Diff rendering
|
||||||
|
hi DiffText ctermfg=White ctermbg=none
|
||||||
|
hi DiffFile ctermfg=White ctermbg=none cterm=bold
|
||||||
|
hi DiffIndexLine ctermfg=White ctermbg=none cterm=bold
|
||||||
|
hi DiffAdd ctermfg=DarkGreen ctermbg=none
|
||||||
|
hi DiffChange ctermfg=DarkRed ctermbg=none
|
||||||
|
hi DiffDelete ctermfg=DarkRed ctermbg=none
|
||||||
|
|
||||||
" Disable the gitgutter background
|
" Disable the gitgutter background
|
||||||
let g:gitgutter_override_sign_column_highlight = 1
|
let g:gitgutter_override_sign_column_highlight = 1
|
||||||
highlight clear SignColumn
|
highlight clear SignColumn
|
||||||
|
@ -71,6 +71,10 @@ Host *.ring.nlnog.net
|
|||||||
Host sdf.org *.sdf.org
|
Host sdf.org *.sdf.org
|
||||||
user ewpratten
|
user ewpratten
|
||||||
|
|
||||||
|
# Guru
|
||||||
|
Host *.gurustudio.com
|
||||||
|
User "guru-domain\\epratten"
|
||||||
|
|
||||||
# Personal Infra
|
# Personal Infra
|
||||||
Host oci-arm
|
Host oci-arm
|
||||||
HostName oci-arm.ip.ewp.fyi
|
HostName oci-arm.ip.ewp.fyi
|
||||||
|
@ -11,6 +11,7 @@ alias flush-dns="sudo systemd-resolve --flush-caches"
|
|||||||
alias showsizes="du -h --max-depth=1"
|
alias showsizes="du -h --max-depth=1"
|
||||||
alias lsgrep="ls | grep"
|
alias lsgrep="ls | grep"
|
||||||
alias sheridan-rdp='firefox --new-window "ext+container:name=College&url=https://client.wvd.microsoft.com/arm/webclient/index.html"'
|
alias sheridan-rdp='firefox --new-window "ext+container:name=College&url=https://client.wvd.microsoft.com/arm/webclient/index.html"'
|
||||||
|
alias git-diff-nvim="git diff | nvim -R -d -c 'set filetype=diff' -"
|
||||||
|
|
||||||
# WHOIS macros
|
# WHOIS macros
|
||||||
alias whois-afrinic="whois -h whois.afrinic.net"
|
alias whois-afrinic="whois -h whois.afrinic.net"
|
||||||
|
@ -70,11 +70,17 @@
|
|||||||
~/.config/logid/logid.cfg: configs/logid/logid.cfg
|
~/.config/logid/logid.cfg: configs/logid/logid.cfg
|
||||||
|
|
||||||
- shell:
|
- shell:
|
||||||
|
# Make sure we have our git modules
|
||||||
- [git submodule update --init --recursive, Installing submodules]
|
- [git submodule update --init --recursive, Installing submodules]
|
||||||
|
# Install SSH config
|
||||||
- [sh ./helpers/install-ssh-config.sh, Installing SSH config]
|
- [sh ./helpers/install-ssh-config.sh, Installing SSH config]
|
||||||
|
# Ensure that all downloaded scripts are executable
|
||||||
- [chmod +x configs/scripts/catto, Making catto executable]
|
- [chmod +x configs/scripts/catto, Making catto executable]
|
||||||
- [chmod +x configs/scripts/aspath, Making aspath executable]
|
- [chmod +x configs/scripts/aspath, Making aspath executable]
|
||||||
- [chmod +x configs/scripts/fetch-steamdeck-screenshots, Making fetch-steamdeck-screenshots executable]
|
- [chmod +x configs/scripts/fetch-steamdeck-screenshots, Making fetch-steamdeck-screenshots executable]
|
||||||
|
# Configure GNOME
|
||||||
- [sh ./helpers/configure-gnome.sh, Configuring GNOME]
|
- [sh ./helpers/configure-gnome.sh, Configuring GNOME]
|
||||||
|
# Configure Termux if on Android
|
||||||
- [termux-reload-settings || true, Trying to reload Termux]
|
- [termux-reload-settings || true, Trying to reload Termux]
|
||||||
|
# Configure Git
|
||||||
- [bash ./helpers/git-config-features.sh, Setting up optional git-config features]
|
- [bash ./helpers/git-config-features.sh, Setting up optional git-config features]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user