diff --git a/configs/git/.gitconfig b/configs/git/.gitconfig index 700f478..ce86ee2 100644 --- a/configs/git/.gitconfig +++ b/configs/git/.gitconfig @@ -16,7 +16,7 @@ detachedHead = true [alias] - authors = shortlog --summary --numbered --email + authors = shortlog --summary --numbered --email [filter "lfs"] clean = git-lfs clean -- %f diff --git a/configs/nvim/init.vim b/configs/nvim/init.vim index 2215d24..0768444 100644 --- a/configs/nvim/init.vim +++ b/configs/nvim/init.vim @@ -70,10 +70,19 @@ if !exists('g:vscode') hi clear SpellCap hi clear SpellRare - " Disable spellcheck for manpages + " Disable spellcheck for some file formats autocmd FileType man setlocal nospell + autocmd FileType diff setlocal nospell 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 let g:gitgutter_override_sign_column_highlight = 1 highlight clear SignColumn diff --git a/configs/ssh/config b/configs/ssh/config index 3aecff3..85669c3 100644 --- a/configs/ssh/config +++ b/configs/ssh/config @@ -71,6 +71,10 @@ Host *.ring.nlnog.net Host sdf.org *.sdf.org user ewpratten +# Guru +Host *.gurustudio.com + User "guru-domain\\epratten" + # Personal Infra Host oci-arm HostName oci-arm.ip.ewp.fyi diff --git a/configs/zsh/macros.sh b/configs/zsh/macros.sh index 4bc77e9..fc68396 100644 --- a/configs/zsh/macros.sh +++ b/configs/zsh/macros.sh @@ -11,6 +11,7 @@ alias flush-dns="sudo systemd-resolve --flush-caches" alias showsizes="du -h --max-depth=1" 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 git-diff-nvim="git diff | nvim -R -d -c 'set filetype=diff' -" # WHOIS macros alias whois-afrinic="whois -h whois.afrinic.net" diff --git a/install.conf.yaml b/install.conf.yaml index 31ce75a..5a437b2 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -70,11 +70,17 @@ ~/.config/logid/logid.cfg: configs/logid/logid.cfg - shell: + # Make sure we have our git modules - [git submodule update --init --recursive, Installing submodules] + # Install 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/aspath, Making aspath executable] - [chmod +x configs/scripts/fetch-steamdeck-screenshots, Making fetch-steamdeck-screenshots executable] + # Configure GNOME - [sh ./helpers/configure-gnome.sh, Configuring GNOME] + # Configure Termux if on Android - [termux-reload-settings || true, Trying to reload Termux] + # Configure Git - [bash ./helpers/git-config-features.sh, Setting up optional git-config features]