Some updates to plugins

This commit is contained in:
ViViDboarder 2014-08-28 15:17:21 -07:00
parent 905e74f14a
commit 0582a9485a
2 changed files with 34 additions and 14 deletions

View File

@ -70,6 +70,10 @@ fi
echo "Install all bundles" echo "Install all bundles"
vim +BundleInstall! +qall vim +BundleInstall! +qall
echo "Compile vimproc"
cd ~/.vim/bundle/vimproc.vim && make
cd -
# Compile CommandT if possible # Compile CommandT if possible
# See if ruby is installed # See if ruby is installed
if command -v ruby >/dev/null 2>&1; then if command -v ruby >/dev/null 2>&1; then

44
vimrc
View File

@ -11,7 +11,8 @@ Plugin 'gmarik/vundle'
" Rest of my bundles " Rest of my bundles
" -- File Nav -- " -- File Nav --
Plugin 'scrooloose/nerdtree' " File tree navigation "Plugin 'scrooloose/nerdtree' " File tree navigation
Plugin 'tpope/vim-vinegar' " Simple file navigation
Plugin 'a.vim' " Switch to alternate file Plugin 'a.vim' " Switch to alternate file
Plugin 'file-line' " Allow opening to a line from file name using : Plugin 'file-line' " Allow opening to a line from file name using :
Plugin 'tpope/vim-fugitive' " Git integration Plugin 'tpope/vim-fugitive' " Git integration
@ -25,7 +26,7 @@ end
if use_command_t == 1 && has('ruby') if use_command_t == 1 && has('ruby')
Plugin 'wincent/Command-T' Plugin 'wincent/Command-T'
else else
Plugin 'kien/ctrlp.vim' Plugin 'ctrlpvim/ctrlp.vim'
end end
" -- Buffer Nav -- " -- Buffer Nav --
@ -34,8 +35,9 @@ Plugin 'sandeepcr529/Buffet.vim' " Quick buffer switching
" -- Nav in file -- " -- Nav in file --
Plugin 'majutsushi/tagbar' " Ctags file parsing Plugin 'majutsushi/tagbar' " Ctags file parsing
Plugin 'scrooloose/syntastic' " Syntax checking Plugin 'scrooloose/syntastic' " Syntax checking
Plugin 'rking/ag.vim' " Project searching
Plugin 'ViViDboarder/QFixToggle' " Easy Toggle of QuickFix window Plugin 'ViViDboarder/QFixToggle' " Easy Toggle of QuickFix window
" TODO: detect if Ag or Ack is installed
Plugin 'rking/ag.vim' " Project searching
"Plugin 'mileszs/ack.vim' " Project Searching "Plugin 'mileszs/ack.vim' " Project Searching
" -- Text Manipulation -- " -- Text Manipulation --
@ -51,14 +53,13 @@ Plugin 'bling/vim-airline' " Custom Status Line
"If using a patched font: https://github.com/Lokaltog/vim-powerline/wiki/Patched-fonts "If using a patched font: https://github.com/Lokaltog/vim-powerline/wiki/Patched-fonts
"let g:airline_powerline_fonts = 1 "let g:airline_powerline_fonts = 1
" -- Sytem -- " -- System --
" Allow async make Plugin 'tpope/vim-dispatch' " Allow async make
Plugin 'tpope/vim-dispatch' Plugin 'Shougo/neocomplcache.vim' " Autocomplete
Plugin 'Shougo/neocomplcache.vim' Plugin 'tpope/vim-rsi' " emacs bindinds in insert
Plugin 'tpope/vim-rsi' Plugin 'tpope/vim-repeat' " Repeat mapped commands with .
Plugin 'tpope/vim-repeat'
" Needs to be compiled " Needs to be compiled
Plugin 'Shougo/vimproc.vim' Plugin 'Shougo/vimproc.vim' " Async for plugins
" -- Themes -- " -- Themes --
Plugin 'vividchalk.vim' Plugin 'vividchalk.vim'
@ -303,9 +304,9 @@ nnoremap <silent> <F2> :Bufferlist<CR>
nnoremap <leader>bl :Bufferlist<CR> nnoremap <leader>bl :Bufferlist<CR>
" NERDTree " NERDTree
nnoremap <silent> <F4> :NERDTreeToggle<CR> " nnoremap <silent> <F4> :NERDTreeToggle<CR>
nnoremap <leader>nn :NERDTreeToggle<CR> "nnoremap <leader>nn :NERDTreeToggle<CR>
nnoremap <leader>nf :NERDTreeFind<CR> "nnoremap <leader>nf :NERDTreeFind<CR>
" TComment " TComment
nnoremap // :TComment<CR> nnoremap // :TComment<CR>
@ -357,7 +358,15 @@ else
" Allow ctrl p to open over the initial nerdtree window " Allow ctrl p to open over the initial nerdtree window
"let g:ctrlp_dont_split = 'NERD_tree_2' "let g:ctrlp_dont_split = 'NERD_tree_2'
let g:ctrlp_dont_split = 'NERD' "let g:ctrlp_dont_split = 'NERD'
let g:ctrlp_dont_split = 'netrw'
" Support tag jumping
let g:ctrlp_extensions = ['tag', 'buffertag']
" Support Apex language
let g:ctrlp_buftag_types = {
\ 'apex' : '--language-force=c#',
\ }
" Leader Commands " Leader Commands
nnoremap <leader>b :CtrlPBuffer<CR> nnoremap <leader>b :CtrlPBuffer<CR>
@ -376,6 +385,13 @@ nnoremap <leader>gw :Gwrite<CR>
" Toggle QuickFix window " Toggle QuickFix window
nnoremap <silent> <F6> :QFix<CR> nnoremap <silent> <F6> :QFix<CR>
" NeoComplCache
let g:neocomplcache_enable_at_startup = 1
let g:neocomplcache_enable_smart_case = 1
let g:neocomplcache_max_list = 10
"let g:neocomplcache_enable_camel_case_completion = 1
let g:neocomplcache_enable_fuzzy_completion = 1
nmap <leader>a :Ag<Space> nmap <leader>a :Ag<Space>
nmap <leader>i* :Ag<Space>-i<Space>'\b<c-r><c-W>\b'<CR> nmap <leader>i* :Ag<Space>-i<Space>'\b<c-r><c-W>\b'<CR>
nmap <leader>* :Ag<Space>'\b<c-r><c-W>\b'<CR> nmap <leader>* :Ag<Space>'\b<c-r><c-W>\b'<CR>