diff --git a/vim/en.utf-8.add b/vim/en.utf-8.add index 522b6b1..dd39e75 100644 --- a/vim/en.utf-8.add +++ b/vim/en.utf-8.add @@ -52,3 +52,11 @@ Dhampir Venmo str/! Dyreson +variadic +Atlantasy +Melany +Cossette +Teagan +Carnifex +Rax +Teeples diff --git a/vim/file_formatting.vim b/vim/file_formatting.vim index ac131fd..6785931 100644 --- a/vim/file_formatting.vim +++ b/vim/file_formatting.vim @@ -1,6 +1,4 @@ -syntax on - -" -- File Formatting ------------------------------------- {{{ +" -- Custom Format Settings ------------------------------ {{{ augroup filetype_specific_formatting autocmd! autocmd FileType python setlocal tabstop=4 softtabstop=4 shiftwidth=4 expandtab foldmethod=indent foldlevel=99 @@ -9,13 +7,12 @@ augroup filetype_specific_formatting autocmd FileType html setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab foldmethod=indent foldlevel=99 autocmd FileType javascript setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab foldmethod=indent foldlevel=99 autocmd FileType css setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab foldmethod=indent foldlevel=99 - autocmd FileType vim setlocal tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab foldmethod=marker foldlevel=1 + autocmd FileType vim setlocal tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab foldmethod=marker foldlevel=99 autocmd FileType sh setlocal tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab foldmethod=indent foldlevel=99 autocmd FileType zsh setlocal tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab foldmethod=indent foldlevel=99 autocmd FileType lisp setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab foldmethod=manual foldlevel=99 - autocmd FileType markdown setlocal tabstop=2 noexpandtab foldmethod=indent foldlevel=99 spell - autocmd FileType tex setlocal noexpandtab foldmethod=indent foldlevel=99 spell - + autocmd FileType markdown setlocal tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab foldmethod=indent foldlevel=99 spell + autocmd FileType tex setlocal tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab foldmethod=indent foldlevel=99 spell augroup end augroup forced_filetype_recognition @@ -24,14 +21,17 @@ augroup end " }}} -" ec Commands run on a per-extension basis {{{ +" -- ec to 'execute' a file ---------------------- {{{ augroup execute_file_shortcuts - " tex opens pdf in chrome - autocmd FileType tex nnoremap ec :! $WEBBROWSER %:r.pdf + autocmd FileType tex nnoremap ec :! $WEBBROWSER %:r.pdf + autocmd FileType markdown nnoremap ec :! $WEBBROWSER %:p augroup end " }}} -" Custom Formatting Layers {{{ +" -- Format Override Layers ------------------------------ {{{ source $VIM_DIR/rd_formatting.vim " }}} + + +syntax on