X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/1143efde9c8c076f83da5bb0d0060bbb09b318a7..c41957e5bcaaecfacc36e95eabfd6fb40ffdb6f5:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index f8a52f6..2a7533d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -6,6 +6,7 @@ " bundles {{{1 filetype off set runtimepath& " reset rtp +autocmd! set runtimepath+=$XDG_DATA_HOME/vim/vundle call vundle#rc('$XDG_DATA_HOME/vim') @@ -14,19 +15,21 @@ Bundle 'gmarik/vundle' Bundle 'bling/vim-airline' Bundle 'elzr/vim-json' -Bundle 'ervandew/ag.git' +Bundle 'rking/ag.vim' Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex' Bundle 'kien/ctrlp.vim' +Bundle 'kshenoy/vim-signature' Bundle 'majutsushi/tagbar' Bundle 'scrooloose/nerdtree' Bundle 'scrooloose/syntastic' Bundle 'sjl/gundo.vim' Bundle 'tomtom/tcomment_vim' +Bundle 'tpope/vim-endwise' Bundle 'tpope/vim-fugitive' +Bundle 'tpope/vim-repeat' Bundle 'tpope/vim-surround' Bundle 'tpope/vim-unimpaired' Bundle 'valloric/youcompleteme' -"Bundle 'zhaocai/goldenview.vim' Bundle 'ompugao/ros.vim' Bundle 'ompugao/ctrlp-ros' @@ -34,9 +37,14 @@ Bundle 'ompugao/ctrlp-ros' Bundle 'firef0x/pkgbuild.vim' Bundle 'derekwyatt/vim-fswitch' " seems to have problems right now... may be add later? -"Bundle 'jalcine/cmake.vim' +" Bundle 'jalcine/cmake.vim' +" Bundle 'powerman/vim-plugin-viewdoc' + +Bundle 'airblade/vim-gitgutter' +Bundle 'Raimondi/delimitMate' +Bundle 'SirVer/ultisnips' +Bundle 'Lokaltog/vim-easymotion' -" rtp + xdg {{{1 " remove entries first set runtimepath -=$HOME/.vim set runtimepath -=$HOME/.vim/after @@ -48,11 +56,16 @@ set runtimepath +=$XDG_CONFIG_HOME/vim/after filetype plugin indent on +" bindings {{{1 +" allow both and / to be +map +nnoremap :make + " moving around, searching and patterns {{{1 set incsearch " show match for partly typed search command set ignorecase " ignore case when using a search pattern set smartcase " override 'ignorecase' when pattern has upper case characters -set hlsearch " highlight all matches for the last used search pattern +set hlsearch " highlight all matches for the last used search pattern " use leader-n to unhighlight search nmap n :silent nohl @@ -60,15 +73,24 @@ nmap n :silent nohl nmap # :%s:/::gn " center cursor after search nnoremap n nzz + " disable arrows -inoremap -inoremap -inoremap +noremap +noremap +noremap +noremap +inoremap +inoremap +inoremap inoremap -noremap -noremap -noremap -noremap +cnoremap +cnoremap +cnoremap +cnoremap +cnoremap +cnoremap +cnoremap +cnoremap set nostartofline " don't move the cursor to the first non-blank char of a line set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include @@ -83,6 +105,8 @@ set lazyredraw " don't redraw while executing macros set list " show chars defined in 'listchars' set listchars=tab:»·,trail:· " list of strings used for list mode +set listchars+=extends:⋯,precedes:⋯ +set sidescrolloff=1 " don't scroll over the listchars set number " show the line number for each line set relativenumber " show the relative line number for each line @@ -178,18 +202,6 @@ set nrformats=hex " number formats recognized for CTRL-A and CTRL- " whether to use a popup menu for Insert mode completion set completeopt=longest,menuone,preview -" Indent if we're at the beginning of a line. Else, do completion. -function! InsertTabWrapper() - let col = col('.') - 1 - if !col || getline('.')[col - 1] !~ '\k' - return "\" - else - return "\" -endif -endfunction -inoremap =InsertTabWrapper() -inoremap - " fix legacy vi inconsistency map Y y$ @@ -197,8 +209,8 @@ map Y y$ vnoremap . :normal . " add line without changing position or leaving mode -map o :set pastem`o``:set nopaste -map O :set pastem`O``:set nopaste +noremap o :set pastem`o``:set nopaste +noremap O :set pastem`O``:set nopaste " Don't use Ex mode, use Q for formatting map Q gq @@ -229,9 +241,9 @@ set foldmethod=marker " folding type set foldlevelstart=0 " value for 'foldlevel' when starting to edit a file " space will toggle current fold in normal mode -nnoremap @=(foldlevel('.')?'za':"\") +nnoremap za " create folds around visual selection -vnoremap zf +vnoremap zf " save and restore folds set viewoptions=folds,cursor " don't save local options @@ -256,7 +268,7 @@ set directory=$XDG_CACHE_HOME/vim,.,/var/tmp " command line editing {{{1 set history=500 " how many command lines are remembered -set wildmode=longest:full " specifies how command line completion works +set wildmode=longest:full,full " specifies how command line completion works set wildmenu " command-line completion shows a list of matches " various {{{1 @@ -266,6 +278,11 @@ set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but s set viewdir=$XDG_CACHE_HOME/vim " plugins {{{1 +" ag {{{2 +let g:AgSmartCase = 1 +nnoremap ag yiw:Ag " +vnoremap ag y:Ag " + " airline {{{2 let g:airline_detect_whitespace=2 let g:airline#extensions#tabline#enabled = 1 @@ -286,6 +303,10 @@ nmap dd :tab split \| Gdiff \| wincmd h " delete fugitive buffers when closed autocmd BufReadPost fugitive://* set bufhidden=delete +nnoremap gs :Gstatus +nnoremap gd :Gdiff +nnoremap gc :tab Gcommit -v + " NERDTree {{{2 " open/close NERDTree with \e nmap e :NERDTreeToggle @@ -316,8 +337,16 @@ let g:tagbar_autoshowtag = 1 let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] +" UltiSnips {{{2 +let g:UltiSnipsEditSplit = 'vertical' +let g:UltiSnipsSnippetsDir = "$XDG_CONFIG_HOME/vim/ultisnips" + " YouCompleteMe {{{2 -let g:ycm_extra_conf_globlist = ['~/src/*'] +let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*'] +let g:ycm_add_preview_to_completeopt = 1 +let g:ycm_autoclose_preview_window_after_insertion = 1 +"let g:ycm_extra_conf_vim_data = ['%:p'] +nnoremap jd :YcmCompleter GoTo " vim-json {{{2 let g:vim_json_syntax_conceal = 0 @@ -325,6 +354,11 @@ let g:vim_json_syntax_conceal = 0 " vim-latex {{{2 let g:tex_flavor='latex' let g:Tex_DefaultTargetFormat='pdf' +let g:Tex_MultipleCompileFormats='pdf' + +" " vim-viewdoc {{{2 +" let g:no_viewdoc_maps = 1 +" nnoremap K :call ViewDoc('doc', '') " functions {{{1 " auto source vimrc when saved