vimrc: don't wrap anymore

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 841be45427e20d41fe1bae6824c51ff7c5951103..7ef205bc2b558ac33bf283cc546f07050bb4da52 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -8,22 +8,32 @@ set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
 
 " bundles {{{1
 filetype off
-set rtp+=$XDG_DATA_HOME/vim/vundle
+set runtimepath+=$XDG_DATA_HOME/vim/vundle
 call vundle#rc('$XDG_DATA_HOME/vim')
 
 Bundle 'gmarik/vundle'
+
 Bundle 'bling/vim-airline'
-Bundle 'ctrlp.vim'
-Bundle 'fugitive.vim'
-Bundle 'Gundo'
-Bundle 'The-NERD-tree'
-Bundle 'surround.vim'
-Bundle 'Syntastic'
-Bundle 'Tagbar'
-Bundle 'tComment'
-Bundle 'Valloric/YouCompleteMe'
 Bundle 'elzr/vim-json'
+Bundle 'ervandew/ag.git'
 Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex'
+Bundle 'kien/ctrlp.vim'
+Bundle 'majutsushi/tagbar'
+Bundle 'scrooloose/nerdtree'
+Bundle 'scrooloose/syntastic'
+Bundle 'sjl/gundo.vim'
+Bundle 'tomtom/tcomment_vim'
+Bundle 'tpope/vim-fugitive'
+Bundle 'tpope/vim-surround'
+Bundle 'tpope/vim-unimpaired'
+Bundle 'valloric/youcompleteme'
+Bundle 'zhaocai/goldenview.vim'
+
+Bundle 'ompugao/ros.vim'
+Bundle 'ompugao/ctrlp-ros'
+
+Bundle 'derekwyatt/vim-fswitch'
+Bundle 'jalcine/cmake.vim'
 
 filetype plugin indent on
 
@@ -54,7 +64,7 @@ set path=.,**           " current + subdirectory search for :find, :grep:, ...
 
 " displaying text {{{1
 set scrolloff=5                 " number of screen lines to show around the cursor
-set wrap                        " long lines wrap
+set nowrap                      " long lines wrap
 set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=▒▒                " show these chars for wrapped lines
 
@@ -91,19 +101,28 @@ set spelllang=en_gb             " list of accepted languages
 set dictionary=spell            " list of dictionary files for keyword completion
 " Spell Check http://tex.stackexchange.com/a/52932
 let b:myLang=0
-let g:myLangList=["nospell","en_gb","en_us","de","fr"]
+let g:myLangList=["en_gb","en_us","de","fr"]
+
 function! ToggleSpell()
-  let b:myLang=b:myLang+1
-  if b:myLang>=len(g:myLangList) | let b:myLang=0 | endif
-  if b:myLang==0
-    setlocal nospell
-  else
-    execute "setlocal spell spelllang=".get(g:myLangList, b:myLang)
+  execute "setlocal spell!"
+  if (&spell)
+    echo "setlocal spelllang=" g:myLangList[b:myLang]
   endif
-  echo "spell checking language:" g:myLangList[b:myLang]
 endfunction
-map <F10> :call ToggleSpell()<CR>
-imap <F10> <C-O>:call ToggleSpell()<CR>
+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 *
@@ -117,11 +136,6 @@ set previewheight=20            " default height for the preview window
 
 set splitright                  " a new window is put right of the current one
 
-nmap <C-J> <C-W>j
-nmap <C-K> <C-W>k
-nmap <C-H> <C-W>h
-nmap <C-L> <C-W>l
-
 map <F1> :ls<CR>:b<space>
 
 " using the mouse {{{1
@@ -246,6 +260,14 @@ let g:airline_left_sep = '▶'
 let g:airline_right_sep = '◀'
 let g:airline#extensions#tabline#enabled = 1
 
+" GoldenView {{{2
+let g:goldenview__enable_default_mapping = 0
+nmap <silent> <C-N>   <Plug>GoldenViewSplit
+nmap <silent> <C-L>   <Plug>GoldenViewNext
+nmap <silent> <C-H>   <Plug>GoldenViewPrevious
+nmap <silent> <C-M>   <Plug>GoldenViewSwitchMain
+nmap <silent> <C-S-M> <Plug>GoldenViewPrevious
+
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 " fugitive {{{2
@@ -257,8 +279,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
 
@@ -272,7 +292,7 @@ let g:syntastic_always_populate_loc_list=1
 nmap <silent> <leader>y :SyntasticCheck<cr>
 
 if ! &diff
-   let g:syntastic_check_on_open=1
+  let g:syntastic_check_on_open=1
 endif
 
 " tagbar {{{2