Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2016-07-25 22:57:58 +02:00

17
vimrc
View File

@@ -16,33 +16,33 @@ Plug 'editorconfig/editorconfig-vim'
Plug 'Shougo/unite.vim' Plug 'Shougo/unite.vim'
Plug 'ctrlpvim/ctrlp.vim' Plug 'ctrlpvim/ctrlp.vim'
Plug 'scrooloose/nerdtree' Plug 'scrooloose/nerdtree'
Plug 'scrooloose/nerdcommenter'
Plug 'Valloric/YouCompleteMe', { 'do': './install.sh --tern-completer' } Plug 'Valloric/YouCompleteMe', { 'do': './install.sh --tern-completer' }
Plug 'mbbill/undotree' Plug 'mbbill/undotree'
Plug 'nathanaelkane/vim-indent-guides'
Plug 'scrooloose/nerdcommenter'
Plug 'sheerun/vim-polyglot' Plug 'nathanaelkane/vim-indent-guides'
Plug 'SirVer/ultisnips' Plug 'SirVer/ultisnips'
Plug 'honza/vim-snippets' Plug 'honza/vim-snippets'
Plug 'sheerun/vim-polyglot'
Plug 'scrooloose/syntastic' Plug 'scrooloose/syntastic'
Plug 'pmsorhaindo/syntastic-local-eslint.vim'
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
Plug 'rhysd/conflict-marker.vim' Plug 'rhysd/conflict-marker.vim'
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
Plug 'inside/vim-search-pulse' Plug 'inside/vim-search-pulse'
Plug 'rking/ag.vim'
Plug 'BufOnly.vim' Plug 'BufOnly.vim'
Plug 'rking/ag.vim'
Plug 'christoomey/vim-tmux-navigator'
Plug 'itchyny/lightline.vim' Plug 'itchyny/lightline.vim'
Plug 'chriskempson/base16-vim' Plug 'chriskempson/base16-vim'
Plug 'Raimondi/delimitMate' Plug 'Raimondi/delimitMate'
@@ -50,13 +50,12 @@ Plug 'Raimondi/delimitMate'
Plug 'pangloss/vim-javascript' Plug 'pangloss/vim-javascript'
Plug 'marijnh/tern_for_vim', { 'do': 'npm install', 'for': 'javascript'} Plug 'marijnh/tern_for_vim', { 'do': 'npm install', 'for': 'javascript'}
Plug 'mustache/vim-mustache-handlebars' Plug 'mustache/vim-mustache-handlebars'
Plug 'mtscout6/syntastic-local-eslint.vim'
"Plug 'mxw/vim-jsx' "Plug 'mxw/vim-jsx'
Plug 'suan/vim-instant-markdown' Plug 'suan/vim-instant-markdown'
Plug 'xuhdev/vim-latex-live-preview' Plug 'xuhdev/vim-latex-live-preview'
Plug 'wesQ3/vim-windowswap'
call plug#end() call plug#end()
"" reload when vim config changes "" reload when vim config changes