zsh: add jade to rosinit

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index f7a072b60d866ac030a3133bf0bfafebfe611d96..cbcc9ac4114189b4360c9cde459149ed775bc488 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -25,7 +25,6 @@ Plugin 'majutsushi/tagbar'
 Plugin 'rking/ag.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
 Plugin 'rking/ag.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'

-Plugin 'sirver/ultisnips'

 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-fugitive'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-fugitive'


@@ -34,6 +33,11 @@ Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-unimpaired'
 Plugin 'valloric/youcompleteme'
 
 Plugin 'tpope/vim-unimpaired'
 Plugin 'valloric/youcompleteme'
 

+" snippets
+Plugin 'sirver/ultisnips'
+Plugin 'honza/vim-snippets'
+
+" ros

 Plugin 'ompugao/ros.vim'
 Plugin 'ompugao/ctrlp-ros'
 
 Plugin 'ompugao/ros.vim'
 Plugin 'ompugao/ctrlp-ros'
 


@@ -50,6 +54,7 @@ Plugin 'lokaltog/vim-easymotion'
 Plugin 'chrisbra/checkattach'
 Plugin 'klen/python-mode'
 Plugin 'nathanaelkane/vim-indent-guides'
 Plugin 'chrisbra/checkattach'
 Plugin 'klen/python-mode'
 Plugin 'nathanaelkane/vim-indent-guides'

+Plugin 'vim-scripts/yankring.vim'

 
 " remove entries first
 set runtimepath -=$HOME/.vim
 
 " remove entries first
 set runtimepath -=$HOME/.vim


@@ -398,7 +403,7 @@ nnoremap <leader>ag yiw:Ag \12"<cr>
 vnoremap <leader>ag y:Ag \12"<cr>
 
 " airline {{{2
 vnoremap <leader>ag y:Ag \12"<cr>
 
 " airline {{{2

-let g:airline_detect_whitespace=2
+let g:airline#extensions#whitespace#enabled = 1

 let g:airline#extensions#tabline#enabled = 1
 let g:airline_powerline_fonts = 1
 
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_powerline_fonts = 1
 


@@ -483,6 +488,17 @@ let g:UltiSnipsExpandTrigger = "<C-L>"
 let g:UltiSnipsJumpForwardTrigger = "<C-L>"
 let g:UltiSnipsJumpBackwardTrigger = "<C-H>"
 
 let g:UltiSnipsJumpForwardTrigger = "<C-L>"
 let g:UltiSnipsJumpBackwardTrigger = "<C-H>"
 

+" yankring {{{2
+nnoremap <silent> <leader>p :YRShow<cr>
+let g:yankring_history_dir = expand('$XDG_CACHE_HOME/vim')
+let g:yankring_replace_n_pkey = ''
+let g:yankring_replace_n_nkey = ''
+
+" map Y to y$ for the yank ring
+function! YRRunAfterMaps()
+    nnoremap Y   :<C-U>YRYankCount 'y$'<CR>
+endfunction
+

 " youcompleteme {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
 " youcompleteme {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')