move to private config. update nvim setup. add direnv hook.

main
Andrew Coleman 2021-05-11 12:12:23 -04:00
parent d589c3fda9
commit c71d2cbe32
16 changed files with 30 additions and 26 deletions

View File

@ -44,7 +44,7 @@ set termguicolors
set visualbell
set noerrorbells
set whichwrap=<,>,[,],b,
set background=dark
"set background=dark
set backspace=indent,eol,start
set number
set autoread
@ -67,6 +67,7 @@ autocmd FileType html set shiftwidth=4 softtabstop=4 tabstop=4
autocmd FileType javascript set shiftwidth=4 softtabstop=4 tabstop=4
autocmd FileType htmldjango set shiftwidth=4 softtabstop=4 tabstop=4
autocmd BufNewFile,BufRead *.tera set syntax=django
autocmd BufNewFile,BufRead justfile setf make "expandtab shiftwidth=8 softtabstop=0
" Center screen when scrolling search results
nmap n nzz

View File

@ -18,14 +18,35 @@
defaultBranch = main
[delta]
features = decorations
features = decorations hoopoe
line-numbers = true
syntax-theme = zenburn
#syntax-theme = Solarized (light)
[delta "hoopoe"]
# author: https://github.com/dandavison
commit-decoration-style = blue ol
commit-style = raw
file-style = omit
hunk-header-decoration-style = blue box
hunk-header-file-style = red
hunk-header-line-number-style = "#067a00"
hunk-header-style = file line-number syntax
light = true
minus-emph-style = normal "#ffc0c0"
minus-empty-line-marker-style = normal "#ffe0e0"
minus-non-emph-style = normal "#ffe0e0"
minus-style = normal "#ffe0e0"
plus-emph-style = syntax "#a0efa0"
plus-empty-line-marker-style = normal "#d0ffd0"
plus-non-emph-style = syntax "#d0ffd0"
plus-style = syntax "#d0ffd0"
syntax-theme = GitHub
zero-style = syntax
[delta "decorations"]
commit-decoration-style = bold yellow box
file-style = bold yellow
file-decoration-style = yellow ul
#commit-decoration-style = bold yellow box
#file-style = bold blue
file-decoration-style = blue ol
hunk-header-style = omit
[rebase]

View File

@ -33,24 +33,4 @@ ex ()
fi
}
# change the title of the current window or tab
title()
{
echo -ne "\033]0;$*\007"
}
ssh()
{
echo -ne '\e[22t'
/usr/bin/ssh "$@"
echo -ne '\e[23t'
}
su()
{
echo -ne '\e[22t'
/bin/su "$@"
echo -ne '\e[23t'
}
alias m4b-tool='docker run -it --rm -u $(id -u):$(id -g) -v "$(pwd)":/mnt m4b-tool'

View File

@ -0,0 +1,2 @@
#!/usr/bin/env bash
eval "$(direnv hook bash)"