From b9b9ec18fa3233d289fa366da709478b823fe158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 12:57:56 +0200 Subject: [PATCH] Vundle used to install Vundle --- .gitignore | 3 +- .gitmodules | 7 +- .vim/autoload/pathogen.vim | 326 ------------------------------- .vim/bundle/Vundle.vim | 1 + .vim/bundle/vim-colors-solarized | 1 - .vimrc | 17 +- common/configure_fresh_system | 2 + 7 files changed, 23 insertions(+), 334 deletions(-) delete mode 100644 .vim/autoload/pathogen.vim create mode 160000 .vim/bundle/Vundle.vim delete mode 160000 .vim/bundle/vim-colors-solarized diff --git a/.gitignore b/.gitignore index d2907491..d3ddc045 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .vim/undo/ .vim/.netrwhist - +.vim/bundle/* +!.vim/bundle/Vundle.vim diff --git a/.gitmodules b/.gitmodules index 51cc99c1..0e19dc7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,10 +22,6 @@ [submodule ".vim/bundle/vim-gitgutter"] path = .vim/bundle/vim-gitgutter url = https://github.com/airblade/vim-gitgutter -[submodule ".vim/bundle/vim-colors-solarized"] - path = .vim/bundle/vim-colors-solarized - url = https://github.com/cyplo/vim-colors-solarized.git - [submodule ".oh-my-zsh"] path = .oh-my-zsh url = git://github.com/robbyrussell/oh-my-zsh.git @@ -65,3 +61,6 @@ [submodule ".vim/bundle/vim-dispatch"] path = .vim/bundle/vim-dispatch url = https://github.com/tpope/vim-dispatch.git +[submodule ".vim/bundle/Vundle.vim"] + path = .vim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim.git diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim deleted file mode 100644 index 7b89ccaf..00000000 --- a/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,326 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.2 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. For maximum ease of reading, -" :set foldmethod=marker - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -function! s:warn(msg) - echohl WarningMsg - echomsg a:msg - echohl NONE -endfunction - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke -" pathogen#surround(). For backwards compatibility purposes, a full path that -" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories() -" instead. -function! pathogen#infect(...) abort " {{{1 - for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}'] - if path =~# '^[^\\/]\+$' - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#incubate(path . '/{}') - elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$' - call pathogen#incubate(path) - elseif path =~# '[\\/]\%({}\|\*\)$' - call pathogen#surround(path) - else - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#surround(path . '/{}') - endif - endfor - call pathogen#cycle_filetype() - return '' -endfunction " }}}1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags')) - silent! execute 'helptags' pathogen#fnameescape(dir.'/doc') - endif - endfor - endfor -endfunction " }}}1 - -command! -bar Helptags :call pathogen#helptags() - -" Execute the given command. This is basically a backdoor for --remote-expr. -function! pathogen#execute(...) abort " {{{1 - for command in a:000 - execute command - endfor - return '' -endfunction " }}}1 - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort "{{{1 - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction " }}}1 - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) abort " {{{1 - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction " }}}1 - -if exists(':Vedit') - finish -endif - -let s:vopen_warning = 0 - -function! s:find(count,cmd,file,lcd) " {{{1 - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - endif - if !s:vopen_warning - let s:vopen_warning = 1 - let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE' - else - let warning = '' - endif - if a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) . warning - else - return a:cmd.' '.pathogen#fnameescape(file) . warning - endif -endfunction " }}}1 - -function! s:Findcomplete(A,L,P) " {{{1 - let sep = pathogen#separator() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction " }}}1 - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set et sw=2: diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim new file mode 160000 index 00000000..49847675 --- /dev/null +++ b/.vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45 diff --git a/.vim/bundle/vim-colors-solarized b/.vim/bundle/vim-colors-solarized deleted file mode 160000 index b1f234b8..00000000 --- a/.vim/bundle/vim-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b1f234b8aa879a8276fc2c73c99ec68d7635de96 diff --git a/.vimrc b/.vimrc index 28b29041..1c24ac65 100755 --- a/.vimrc +++ b/.vimrc @@ -48,8 +48,21 @@ set shiftwidth=4 set expandtab " plugins -execute pathogen#infect() -filetype plugin indent on + +filetype off + +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +" let Vundle manage Vundle, required +Plugin 'VundleVim/Vundle.vim' + +Plugin 'https://github.com/cyplo/vim-colors-solarized.git' + +call vundle#end() " required +filetype plugin indent on " required + " colours [need pathogen] set t_Co=256 diff --git a/common/configure_fresh_system b/common/configure_fresh_system index f7e48c1d..4fc49505 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -87,6 +87,8 @@ fi cargo install -f rustfmt +echo "\n" | vim +PluginInstall +qa + cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive ./install.py --racer-completer --clang-completer