diff --git a/dotfiles/vim/vimrc b/dotfiles/vim/vimrc index fde81b7..f8e2e40 100644 --- a/dotfiles/vim/vimrc +++ b/dotfiles/vim/vimrc @@ -21,50 +21,44 @@ imap :wi nmap y "*yy nmap p "*p " }}} -" VUNDLE {{{ -filetype off -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() - -" let Vundle manage Vundle, required -Plugin 'VundleVim/Vundle.vim' +" VIM-PLUG {{{ +call plug#begin('~/.vim/plugged') " AUTOCOMPLETION, FORMATTING AND LINTING " Main autocompletion -Plugin 'ycm-core/YouCompleteMe' +Plug 'ycm-core/YouCompleteMe', { 'do': './install.py --clang-completer --rust-complete --system-libclang' } " PEP8 linting for Python -Plugin 'nvie/vim-flake8' +Plug 'nvie/vim-flake8' " Vim integration for various linters -Plugin 'dense-analysis/ale' +Plug 'dense-analysis/ale' " Black autoformatter for Python -Plugin 'psf/black' +Plug 'psf/black', { 'branch': 'stable' } " HIGHLIGHTING " Whitespace highlighting and removal -Plugin 'ntpeters/vim-better-whitespace' +Plug 'ntpeters/vim-better-whitespace' " Python IDE -Plugin 'python-mode/python-mode' +Plug 'python-mode/python-mode', { 'do': 'git submodule update --init --recursive' } " C syntax highlighting -Plugin 'c.vim' +Plug 'vim-scripts/c.vim' " Rust syntax highlighting -Plugin 'rust-lang/rust.vim' +Plug 'rust-lang/rust.vim' " Markdown syntax highlighting -Plugin 'godlygeek/tabular' | Plugin 'plasticboy/vim-markdown' +Plug 'godlygeek/tabular' | Plug 'plasticboy/vim-markdown' " STATUSLINE -Plugin 'vim-airline/vim-airline' -Plugin 'vim-airline/vim-airline-themes' +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' " MISC. " A tree explorer plugin -Plugin 'preservim/nerdtree' +Plug 'preservim/nerdtree' " A NERDTree plugin showing git status -Plugin 'Xuyuanp/nerdtree-git-plugin' +Plug 'Xuyuanp/nerdtree-git-plugin' " Display thin vertical lines at each indentation level -Plugin 'Yggdroot/indentLine' +Plug 'Yggdroot/indentLine' -call vundle#end() -filetype plugin indent on +call plug#end() " }}} " PLUGIN OPTIONS {{{ let g:ale_python_mypy_options = '--strict --strict-optional'