Switched to vim-plug

This commit is contained in:
lanxu 2017-05-23 21:29:06 +03:00
parent 97578115b2
commit 088fe0b6c2

94
.vimrc
View File

@ -1,60 +1,60 @@
" Vundle setup
set nocompatible " be iMproved
filetype off " required!
" set the runtime path to include Vundle and initialize
"call has('python3')
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
" let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim'
" Vundle bundles
" Start plugins
call plug#begin('~/.vim/plugged')
" Javascript
Plugin 'pangloss/vim-javascript'
" Plugin 'jelera/vim-javascript-syntax' " Replaced by yajs.vim
Plugin 'nathanaelkane/vim-indent-guides'
Plugin 'othree/yajs.vim'
Plugin 'gavocanov/vim-js-indent'
Plugin 'digitaltoad/vim-jade'
Plugin 'othree/es.next.syntax.vim'
Plugin 'othree/jsdoc-syntax.vim'
Plugin 'othree/html5.vim'
Plugin 'heavenshell/vim-jsdoc'
Plugin 'othree/javascript-libraries-syntax.vim'
Plugin 'moll/vim-node'
"Plugin 'ternjs/tern_for_vim'
" Plug 'jelera/vim-javascript-syntax' " Replaced by yajs.vim
Plug 'pangloss/vim-javascript', {'for': 'javascript'}
Plug 'nathanaelkane/vim-indent-guides', {'for': 'javascript'}
Plug 'othree/yajs.vim', {'for': 'javascript'}
Plug 'gavocanov/vim-js-indent', {'for': 'javascript'}
Plug 'digitaltoad/vim-jade', {'for': 'javascript'}
Plug 'othree/es.next.syntax.vim', {'for': 'javascript'}
Plug 'othree/jsdoc-syntax.vim', {'for': 'javascript'}
Plug 'othree/html5.vim', {'for': 'javascript'}
Plug 'heavenshell/vim-jsdoc', {'for': 'javascript'}
Plug 'othree/javascript-libraries-syntax.vim', {'for': 'javascript'}
Plug 'moll/vim-node', {'for': 'javascript'}
Plug 'ternjs/tern_for_vim', {'for': 'javascript'}
" C/C++
"Plug 'majutsushi/tagbar'
" Syntax checking
Plugin 'Valloric/YouCompleteMe'
Plugin 'scrooloose/syntastic'
Plug 'Valloric/YouCompleteMe'
Plug 'scrooloose/syntastic'
" Useful plugins
Plugin 'Raimondi/delimitMate'
Plugin 'scrooloose/nerdcommenter'
Plugin 'scrooloose/nerdtree'
Plugin 'jlanzarotta/bufexplorer'
Plugin 'ctrlpvim/ctrlp.vim'
Plug 'Raimondi/delimitMate'
Plug 'scrooloose/nerdcommenter'
Plug 'scrooloose/nerdtree'
Plug 'jlanzarotta/bufexplorer'
Plug 'ctrlpvim/ctrlp.vim'
" Snippets
Plug 'sirver/ultisnips'
Plug 'honza/vim-snippets'
" Themes
"Plugin 'Lokaltog/vim-distinguished'
Plugin 'altercation/vim-colors-solarized'
"Plugin 'tomasr/molokai'
"Plugin 'flazz/vim-colorschemes'
Plugin 'morhetz/gruvbox'
Plugin 'chriskempson/base16-vim'
"Plug 'Lokaltog/vim-distinguished'
"Plug 'altercation/vim-colors-solarized'
"Plug 'tomasr/molokai'
"Plug 'flazz/vim-colorschemes'
"Plug 'morhetz/gruvbox'
Plug 'chriskempson/base16-vim'
" Airline
Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
let g:airline_theme='base16_default'
let g:airline_powerline_fonts = 1
" All of your Plugins must be added before the following line
call vundle#end() " required
filetype plugin indent on " required
" Initialize plugin system
call plug#end()
filetype plugin indent on
" Other
set t_Co=256
@ -181,7 +181,8 @@ inoremap <C-t> <Esc>:tabnew<CR>
" YouCompleteMe
let g:ycm_add_preview_to_completeopt=0
let g:ycm_confirm_extra_conf=0
"let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
set completeopt-=preview
set ssop-=options " do not store global and local values in a session
set ssop-=folds " do not store folds
@ -201,13 +202,15 @@ let g:syntastic_check_on_open = 1
let g:syntastic_check_on_wq = 0
let g:syntastic_javascript_checkers = ['eslint']
map <F12> :GoTo<CR>
" Toggle number
:nmap <C-N><C-N> :set invnumber<CR>
" Toggle hlsearch
:nnoremap <silent> <Space> :nohlsearch<Bar>:echo<CR>
autocmd BufRead,BufNewFile *.es6 setfiletype javascript
map <F12> :%!tidy -q --tidy-mark 0 2>/dev/null<CR>
"map <F12> :%!tidy -q --tidy-mark 0 2>/dev/null<CR>
" Configure for jsdoc
let g:jsdoc_enable_es6 = 1
@ -222,4 +225,9 @@ set expandtab
set shiftwidth=2
set smarttab
autocmd Filetype python setlocal ts=4 sw=4 sts=0 expandtab
autocmd Filetype cpp setlocal ts=4 sw=4 sts=0 expandtab
let g:UltiSnipsExpandTrigger="<c-tab>"
let g:UltiSnipsJumpForwardTrigger="<c-b>"
let g:UltiSnipsJumpBackwardTrigger="<c-z>"