diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 5e11419..7d82aa2 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -1,76 +1,44 @@ set encoding=utf-8 -" START - Setting up Vundle - the vim plugin bundler -let iCanHazVundle=1 -let vundle_readme=expand('~/.vim/bundle/Vundle.vim/README.md') -if !filereadable(vundle_readme) - echo "Installing Vundle.." - echo "" - silent !mkdir -p ~/.vim/bundle - silent !git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim - let iCanHazVundle=0 -endif -set rtp+=~/.vim/bundle/Vundle.vim/ -call vundle#rc() -" let Vundle manage Vundle, required -Plugin 'VundleVim/Vundle.vim' +"vim-plug installation -if iCanHazVundle == 0 - echo "Installing Bundles, please ignore key map error messages" - echo "" - :source $MYVIMRC - :PluginInstall +if empty(glob('~/.vim/autoload/plug.vim')) + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC endif -" END - Setting up Vundle - the vim plugin bundler set nocompatible " be iMproved, required -filetype off " required -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() -" alternatively, pass a path where Vundle should install plugins -"call vundle#begin('~/some/path/here') +call plug#begin('~/.vim/bundle') -" let Vundle manage Vundle, required -Plugin 'airblade/vim-gitgutter' -Plugin 'artur-shaik/vim-javacomplete2' -Plugin 'ctrlpvim/ctrlp.vim' -Plugin 'davidhalter/jedi-vim' -Plugin 'dense-analysis/ale' -Plugin 'ervandew/supertab' -Plugin 'junegunn/vim-peekaboo' -Plugin 'keith/swift.vim' -Plugin 'LaTeX-Box-Team/LaTeX-Box' -Plugin 'mattn/emmet-vim' -Plugin 'mattn/webapi-vim' -Plugin 'posva/vim-vue' -Plugin 'scrooloose/nerdtree' -Plugin 'Townk/vim-autoclose' -Plugin 'tpope/vim-fugitive' -Plugin 'tpope/vim-surround' -Plugin 'vim-airline/vim-airline' -Plugin 'chauncey-garrett/vim-tasklist' -Plugin 'Vimjas/vim-python-pep8-indent' -Plugin 'VundleVim/Vundle.vim' +Plug 'airblade/vim-gitgutter' +Plug 'artur-shaik/vim-javacomplete2' +Plug 'chauncey-garrett/vim-tasklist' +Plug 'ctrlpvim/ctrlp.vim' +Plug 'davidhalter/jedi-vim' +Plug 'dense-analysis/ale' +Plug 'ervandew/supertab' +Plug 'junegunn/vim-peekaboo' +Plug 'junegunn/vim-plug' +Plug 'keith/swift.vim' +Plug 'LaTeX-Box-Team/LaTeX-Box' +Plug 'mattn/emmet-vim' +Plug 'mattn/webapi-vim' +Plug 'posva/vim-vue' +Plug 'scrooloose/nerdtree' +Plug 'sheerun/vim-polyglot' +Plug 'Townk/vim-autoclose' +Plug 'tpope/vim-fugitive' +Plug 'tpope/vim-surround' +Plug 'vim-airline/vim-airline' -" All of your Plugins must be added before the following line -call vundle#end() " required -filetype plugin indent on " required -" To ignore plugin indent changes, instead use: -filetype plugin on -" Brief help -" :PluginList - lists configured plugins -" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate -" :PluginSearch foo - searches for foo; append `!` to refresh local cache -" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal +call plug#end() -" see :h vundle for more details or wiki for FAQ -" Put your non-Plugin stuff after this line " Leader