X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/51f4f6d6707fb6177d0d4e88fb1b04994066e04e..002334e82dd966e686dd0c6a36f7bc447ab80d86:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index e17be89..c33c18c 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -3,27 +3,46 @@ " Author: Samir Benmendil " -" use xdg -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& " reset rtp + +set runtimepath+=$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' -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' + +" rtp + xdg {{{1 +" remove entries first +set runtimepath -=$HOME/.vim +set runtimepath -=$HOME/.vim/after +set runtimepath -=$XDG_CONFIG_HOME/vim +set runtimepath -=$XDG_CONFIG_HOME/vim/after +" then add prepend and append them +set runtimepath ^=$XDG_CONFIG_HOME/vim +set runtimepath +=$XDG_CONFIG_HOME/vim/after filetype plugin indent on @@ -50,11 +69,11 @@ noremap noremap set nostartofline " don't move the cursor to the first non-blank char of a line -set path=.,** " current + subdirectory search for :find, :grep:, ... +set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include " 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 @@ -84,13 +103,34 @@ endif " syntax, highlighting and spelling {{{1 -set background=dark " Dark background, d'uh! +colorscheme badwolf syntax on -set spelllang=en,de,fr " list of accepted languages set dictionary=spell " list of dictionary files for keyword completion -" toggle spell-checking -map :set nospell!:set nospell? +" 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 s :call ToggleSpell() + +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 S :call SwitchSpell() + +" fix spelling with first choice +nnoremap f 1z= if has("autocmd") au Filetype * @@ -104,13 +144,11 @@ set previewheight=20 " default height for the preview window set splitright " a new window is put right of the current one -nmap j -nmap k -nmap h -nmap l - map :ls:b +nmap w +nmap W + " using the mouse {{{1 set mouse=rnv " list of flags for using the mouse set ttymouse=xterm " type of mouse @@ -123,6 +161,7 @@ vnoremap s set showcmd " Show (partial) command in status line. set ruler " show the cursor position all the time set confirm " Ask what to do when closing unsaved documents +set shortmess=filnxtoOI " don't show intro message " editing text {{{1 set backspace=indent,eol,start " allow backspacing over everything in insert mode @@ -193,6 +232,7 @@ nnoremap @=(foldlevel('.')?'za':"\") vnoremap zf " save and restore folds +set viewoptions=folds,cursor " don't save local options autocmd BufWinLeave *.* mkview autocmd BufWinEnter *.* silent loadview @@ -219,7 +259,7 @@ set wildmenu " command-line completion shows a list of matche " various {{{1 set virtualedit=block " let cursor move past last char in mode -set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .vim +set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache set viewdir=$XDG_CACHE_HOME/vim @@ -232,10 +272,20 @@ 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 GoldenViewSplit +"nmap GoldenViewNext +"nmap GoldenViewPrevious +"nmap GoldenViewSwitchMain +"nmap GoldenViewPrevious + " Gundo {{{2 nnoremap :GundoToggle " fugitive {{{2 nmap dd :tab split \| Gdiff \| wincmd h +" delete fugitive buffers when closed +autocmd BufReadPost fugitive://* set bufhidden=delete " NERDTree {{{2 " open/close NERDTree with \e @@ -243,8 +293,6 @@ nmap e :NERDTreeToggle nmap :NERDTreeToggle " to open files/dirs let NERDTreeMapActivateNode='' -" 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 @@ -258,7 +306,7 @@ let g:syntastic_always_populate_loc_list=1 nmap y :SyntasticCheck if ! &diff - let g:syntastic_check_on_open=1 + let g:syntastic_check_on_open=1 endif " tagbar {{{2 @@ -270,12 +318,20 @@ let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] " YouCompleteMe {{{2 -let g:ycm_extra_conf_globlist = ['/mnt/data/src/*'] +let g:ycm_extra_conf_globlist = ['~/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 +" auto source vimrc when saved +autocmd bufwritepost vimrc source $MYVIMRC +nmap v :tabedit $MYVIMRC + " Convenient command to see the difference between the current buffer and the " file it was loaded from, thus the changes you made. " Only define it when not defined already.