vimrc: don't wrap anymore

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index de0b428bb2821692e3f442257b5b49f0de7e6c19..7ef205bc2b558ac33bf283cc546f07050bb4da52 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -8,23 +8,32 @@ set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
 
 " bundles {{{1
 filetype off
 
 " 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'
 call vundle#rc('$XDG_DATA_HOME/vim')
 
 Bundle 'gmarik/vundle'

+

 Bundle 'bling/vim-airline'
 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 'elzr/vim-json'

-Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex'

 Bundle 'ervandew/ag.git'
 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
 
 
 filetype plugin indent on
 


@@ -55,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
 
 " 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
 
 set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=▒▒                " show these chars for wrapped lines
 


@@ -127,11 +136,6 @@ set previewheight=20            " default height for the preview window
 
 set splitright                  " a new window is put right of the current one
 
 
 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
 map <F1> :ls<CR>:b<space>
 
 " using the mouse {{{1


@@ -256,6 +260,14 @@ let g:airline_left_sep = '▶'
 let g:airline_right_sep = '◀'
 let g:airline#extensions#tabline#enabled = 1
 
 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
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 " fugitive {{{2


@@ -280,7 +292,7 @@ let g:syntastic_always_populate_loc_list=1
 nmap <silent> <leader>y :SyntasticCheck<cr>
 
 if ! &diff
 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
 endif
 
 " tagbar {{{2