X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/51f4f6d6707fb6177d0d4e88fb1b04994066e04e..dbb5ec76ee755f6281551355fa8d4360147eebee:/vim/vimrc?ds=sidebyside

diff --git a/vim/vimrc b/vim/vimrc
index e17be89..5ca9cfd 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -12,7 +12,6 @@ set rtp+=$XDG_DATA_HOME/vim/vundle
 call vundle#rc('$XDG_DATA_HOME/vim')
 
 Bundle 'gmarik/vundle'
-Bundle 'wincent/Command-T'
 Bundle 'bling/vim-airline'
 Bundle 'ctrlp.vim'
 Bundle 'fugitive.vim'
@@ -24,6 +23,9 @@ Bundle 'Tagbar'
 Bundle 'tComment'
 Bundle 'Valloric/YouCompleteMe'
 Bundle 'elzr/vim-json'
+Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex'
+Bundle 'ervandew/ag.git'
+Bundle 'zhaocai/GoldenView.Vim'
 
 filetype plugin indent on
 
@@ -87,10 +89,32 @@ endif
 set background=dark             " Dark background, d'uh!
 syntax on
 
-set spelllang=en,de,fr          " list of accepted languages
+set spelllang=en_gb             " list of accepted languages
 set dictionary=spell            " list of dictionary files for keyword completion
-" toggle spell-checking
-map <silent><F10> :set nospell!<CR>:set nospell?<CR>
+" Spell Check http://tex.stackexchange.com/a/52932
+let b:myLang=0
+let g:myLangList=["en_gb","en_us","de","fr"]
+
+function! ToggleSpell()
+  execute "setlocal spell!"
+  if (&spell)
+    echo "setlocal spelllang=" g:myLangList[b:myLang]
+  endif
+endfunction
+nnoremap <silent> <Leader>s :call ToggleSpell()<CR>
+
+function! SwitchSpell()
+  if (&spell)
+    let b:myLang=b:myLang+1
+    if b:myLang>=len(g:myLangList) | let b:myLang=0 | endif
+  endif
+  execute "setlocal spell spelllang=".get(g:myLangList, b:myLang)
+  echo "setlocal spelllang=" g:myLangList[b:myLang]
+endfunction
+nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
+
+" fix spelling with first choice
+nnoremap <Leader>f 1z=
 
 if has("autocmd")
     au Filetype *
@@ -193,6 +217,7 @@ nnoremap <silent> <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
 vnoremap <Space> zf
 
 " save and restore folds
+set viewoptions=folds,cursor    " don't save local options
 autocmd BufWinLeave *.* mkview
 autocmd BufWinEnter *.* silent loadview
 
@@ -243,8 +268,6 @@ nmap <Leader>e :NERDTreeToggle<CR>
 nmap <F6> :NERDTreeToggle<CR>
 " <space> to open files/dirs
 let NERDTreeMapActivateNode='<space>'
-" open NERDTree if no files were selected
-autocmd vimenter * if !argc() | NERDTree | endif
 " close vim if only NERDTree is open
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 
@@ -275,6 +298,10 @@ let g:ycm_extra_conf_globlist = ['/mnt/data/src/*']
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
+" vim-latex {{{2
+let g:tex_flavor='latex'
+let g:Tex_DefaultTargetFormat='pdf'
+
 " functions {{{1
 " Convenient command to see the difference between the current buffer and the
 " file it was loaded from, thus the changes you made.