Switch to vim-plug

1 files changed, 52 insertions, 44 deletions

diff --git a/.vimrc b/.vimrc
index 65fb988b..e481b1c5 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,14 +1,5 @@
-set nocp
+set nocompatible
 
-" Load pathogen
-runtime bundle/vim-pathogen/autoload/pathogen.vim
-call pathogen#infect()
-
-" Remap leader to ,
-noremap \ ,
-let mapleader = ","
-
-" General
 set backspace=indent,eol,start
 set hidden
 set backup
@@ -33,13 +24,8 @@ set list
 set listchars=tab:»·,trail:·
 set foldmethod=syntax
 set foldlevel=1000
-
-set laststatus=2 " Always show statusline
-set noshowmode
-set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
-
+set laststatus=2
 syntax on
-colorscheme jellybeans
 
 " Enable mouse in terminals
 if has('mouse')
@@ -93,23 +79,9 @@ runtime macros/matchit.vim
 autocmd InsertEnter * setlocal nolist
 autocmd InsertLeave * setlocal list
 
-" Airline config
-let g:airline_left_sep = ''
-let g:airline_right_sep = ''
-
-" Syntastic options
-let g:syntastic_check_on_open=1
-let g:syntastic_enable_signs=0
-let g:syntastic_auto_loc_list=2
-
-" Signify
-let g:signify_vcs_list = ['git']
-let g:signify_sign_overwrite = 1
-let g:signify_sign_change = '~'
-
-let g:airline#extensions#hunks#non_zero_only = 1
-
-let g:airline#extensions#whitespace#enabled = 0
+" Remap leader to ,
+noremap \ ,
+let mapleader = ","
 
 " Custom maps
 nnoremap ' `
@@ -135,17 +107,6 @@ imap <S-tab> <C-v><tab>
 
 nmap Q gq
 
-nmap <leader>b :CtrlPBuffer<CR>
-nmap <leader>e :CtrlP<CR>
-nmap <leader>t :CtrlPBufTag<CR>
-nmap <leader>l :CtrlPLine<CR>
-
-nmap <leader>gs :Gstatus<CR>
-nmap <leader>gc :Gcommit<CR>
-nmap <leader>gp :Git push<CR>
-
-vnoremap <silent> <Enter> :EasyAlign<Enter>
-
 " Toggle relative/absolute numbers
 function! NumberToggle()
   if(&relativenumber == 1)
@@ -160,3 +121,50 @@ nmap <C-n> :call NumberToggle()<CR>
 " Custom commands
 command! W :w
 
+call plug#begin('~/.vim/plugged')
+
+Plug 'bling/vim-airline'
+set noshowmode
+let g:airline_left_sep = ''
+let g:airline_right_sep = ''
+let g:airline#extensions#hunks#non_zero_only = 1
+let g:airline#extensions#whitespace#enabled = 0
+
+Plug 'scrooloose/syntastic'
+let g:syntastic_check_on_open=1
+let g:syntastic_enable_signs=0
+let g:syntastic_auto_loc_list=2
+
+Plug 'mhinz/vim-signify'
+let g:signify_vcs_list = ['git']
+let g:signify_sign_overwrite = 1
+let g:signify_sign_change = '~'
+
+Plug 'kien/ctrlp.vim'
+nmap <leader>b :CtrlPBuffer<CR>
+nmap <leader>e :CtrlP<CR>
+nmap <leader>t :CtrlPBufTag<CR>
+nmap <leader>l :CtrlPLine<CR>
+
+Plug 'tpope/vim-fugitive'
+nmap <leader>gs :Gstatus<CR>
+nmap <leader>gc :Gcommit<CR>
+nmap <leader>gp :Git push<CR>
+
+Plug 'junegunn/vim-easy-align'
+vnoremap <silent> <Enter> :EasyAlign<Enter>
+
+Plug 'Raynes/refheap.vim'
+Plug 'majutsushi/tagbar'
+Plug 'mattn/gist-vim'
+Plug 'mattn/webapi-vim'
+Plug 'programble/itchy.vim'
+Plug 'programble/jellybeans.vim'
+Plug 'sickill/vim-pasta'
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-markdown'
+Plug 'tpope/vim-ragtag'
+
+call plug#end()
+
+colorscheme jellybeans