From 869762c9ae41064d0f9f31eac6e02021e8c328ca Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Tue, 31 Dec 2019 00:34:16 -0500 Subject: [PATCH] Update vimrc --- bin/sync-vim | 5 +++-- install.sh => install | 0 vimrc | 12 +++++------- 3 files changed, 8 insertions(+), 9 deletions(-) rename install.sh => install (100%) mode change 100755 => 100644 diff --git a/bin/sync-vim b/bin/sync-vim index 7bfda7a..3a84e09 100644 --- a/bin/sync-vim +++ b/bin/sync-vim @@ -3,8 +3,9 @@ set -e if [ ! -d "~/.vim" ]; then - echo "Syncing user dictionary" && cp ~/.vim/spell/* ~/.dotfiles/vim/spell/ - echo "Syncing user colors" && cp ~/.vim/colors/* ~/.dotfiles/vim/colors/ + echo "Syncing user dictionary" && cp -r ~/.vim/spell ~/.dotfiles/vim/ + echo "Syncing user colors" && cp -r ~/.vim/colors ~/.dotfiles/vim/ echo "Syncing after directory" && cp -r ~/.vim/after ~/.dotfiles/vim/ echo "Syncing templates" && cp -r ~/.vim/templates ~/.dotfiles/vim/ + echo "Syncing ftdetect" && cp -r ~/.vim/ftdetect ~/.dotfiles/vim/ fi diff --git a/install.sh b/install old mode 100755 new mode 100644 similarity index 100% rename from install.sh rename to install diff --git a/vimrc b/vimrc index 51d61a4..aa65ec2 100644 --- a/vimrc +++ b/vimrc @@ -218,8 +218,8 @@ set cursorcolumn " Store temporary files in a central spot. Make sure these directories exist on disk. set backup set backupcopy=yes -set directory=X://tmp//vim// " For swap files. -set backupdir=X://tmp//vim// +set directory=X://cache//vim// " For swap files. +set backupdir=X://cache//vim// :au BufWritePre * let &bex = '.' . strftime("%Y-%m-%d-%T") . '.bak' set writebackup @@ -297,10 +297,6 @@ augroup campoCmds " Jump to last cursor position unless it's invalid or in an event handler. autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif - " Language identation. - autocmd FileType ruby,haml,eruby,yaml,html,javascript,rust,go set ai sw=2 sts=2 et - autocmd FileType python,qml set sw=4 sts=4 et - " Indent HTML

tags. autocmd FileType html,eruby if g:html_indent_tags !~ '\\|p\>' | let g:html_indent_tags .= '\|p\|li\|dt\|dd' | endif @@ -722,7 +718,9 @@ let g:campo_theme_use_rainbow_parens = 1 "let s:dark_theme = 'campo-dark-grey-blue' "let s:dark_theme = 'campo-dark-greyscale' let s:dark_theme = 'campo-simple-dark' -let s:light_theme = 'campo-light' + +"let s:light_theme = 'campo-light' +let s:light_theme = 'campo-simple-light' execute "autocmd ColorScheme " . s:dark_theme . " call ReloadRainbow()" execute "autocmd ColorScheme " . s:light_theme . " call ReloadRainbow()"