From d4f04dbaebb97520ab57166ee85c0137c4bc7cd9 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 9 Nov 2013 15:24:41 -0500 Subject: Switch to vim-plug --- .gitignore | 5 ++- .gitmodules | 57 ---------------------------- .vimrc | 96 +++++++++++++++++++++++++---------------------- bundle/Vim-Tomorrow-Theme | 1 - bundle/base16-vim | 1 - bundle/ctrlp.vim | 1 - bundle/gist-vim | 1 - bundle/itchy.vim | 1 - bundle/jellybeans.vim | 1 - bundle/refheap.vim | 1 - bundle/syntastic | 1 - bundle/tagbar | 1 - bundle/vim-airline | 1 - bundle/vim-commentary | 1 - bundle/vim-easy-align | 1 - bundle/vim-fugitive | 1 - bundle/vim-markdown | 1 - bundle/vim-pasta | 1 - bundle/vim-pathogen | 1 - bundle/vim-ragtag | 1 - bundle/vim-signify | 1 - bundle/webapi-vim | 1 - vim-plug.sh | 2 + 23 files changed, 57 insertions(+), 122 deletions(-) delete mode 100644 .gitmodules delete mode 160000 bundle/Vim-Tomorrow-Theme delete mode 160000 bundle/base16-vim delete mode 160000 bundle/ctrlp.vim delete mode 160000 bundle/gist-vim delete mode 160000 bundle/itchy.vim delete mode 160000 bundle/jellybeans.vim delete mode 160000 bundle/refheap.vim delete mode 160000 bundle/syntastic delete mode 160000 bundle/tagbar delete mode 160000 bundle/vim-airline delete mode 160000 bundle/vim-commentary delete mode 160000 bundle/vim-easy-align delete mode 160000 bundle/vim-fugitive delete mode 160000 bundle/vim-markdown delete mode 160000 bundle/vim-pasta delete mode 160000 bundle/vim-pathogen delete mode 160000 bundle/vim-ragtag delete mode 160000 bundle/vim-signify delete mode 160000 bundle/webapi-vim create mode 100755 vim-plug.sh diff --git a/.gitignore b/.gitignore index 532147d2..28bda465 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -.netrwhist -plugin/private.vim +autoload +plugin +plugged diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8836f4ae..00000000 --- a/.gitmodules +++ /dev/null @@ -1,57 +0,0 @@ -[submodule "bundle/vim-pathogen"] - path = bundle/vim-pathogen - url = https://github.com/tpope/vim-pathogen.git -[submodule "bundle/ctrlp.vim"] - path = bundle/ctrlp.vim - url = https://github.com/kien/ctrlp.vim.git -[submodule "bundle/Vim-Tomorrow-Theme"] - path = bundle/Vim-Tomorrow-Theme - url = git://github.com/programble/Vim-Tomorrow-Theme.git -[submodule "bundle/vim-pasta"] - path = bundle/vim-pasta - url = https://github.com/sickill/vim-pasta.git -[submodule "bundle/vim-fugitive"] - path = bundle/vim-fugitive - url = https://github.com/tpope/vim-fugitive.git -[submodule "bundle/gist-vim"] - path = bundle/gist-vim - url = https://github.com/mattn/gist-vim.git -[submodule "bundle/syntastic"] - path = bundle/syntastic - url = https://github.com/scrooloose/syntastic.git -[submodule "bundle/vim-markdown"] - path = bundle/vim-markdown - url = https://github.com/tpope/vim-markdown.git -[submodule "bundle/itchy.vim"] - path = bundle/itchy.vim - url = git://github.com/programble/itchy.vim.git -[submodule "bundle/webapi-vim"] - path = bundle/webapi-vim - url = https://github.com/mattn/webapi-vim.git -[submodule "bundle/refheap.vim"] - path = bundle/refheap.vim - url = https://github.com/Raynes/refheap.vim.git -[submodule "bundle/base16-vim"] - path = bundle/base16-vim - url = https://github.com/programble/base16-vim.git -[submodule "bundle/vim-commentary"] - path = bundle/vim-commentary - url = https://github.com/tpope/vim-commentary.git -[submodule "bundle/vim-ragtag"] - path = bundle/vim-ragtag - url = https://github.com/tpope/vim-ragtag.git -[submodule "bundle/vim-airline"] - path = bundle/vim-airline - url = https://github.com/bling/vim-airline.git -[submodule "bundle/tagbar"] - path = bundle/tagbar - url = https://github.com/majutsushi/tagbar.git -[submodule "bundle/vim-signify"] - path = bundle/vim-signify - url = https://github.com/mhinz/vim-signify.git -[submodule "bundle/jellybeans.vim"] - path = bundle/jellybeans.vim - url = https://github.com/programble/jellybeans.vim -[submodule "bundle/vim-easy-align"] - path = bundle/vim-easy-align - url = https://github.com/junegunn/vim-easy-align.git 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 nmap Q gq -nmap b :CtrlPBuffer -nmap e :CtrlP -nmap t :CtrlPBufTag -nmap l :CtrlPLine - -nmap gs :Gstatus -nmap gc :Gcommit -nmap gp :Git push - -vnoremap :EasyAlign - " Toggle relative/absolute numbers function! NumberToggle() if(&relativenumber == 1) @@ -160,3 +121,50 @@ nmap :call NumberToggle() " 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 b :CtrlPBuffer +nmap e :CtrlP +nmap t :CtrlPBufTag +nmap l :CtrlPLine + +Plug 'tpope/vim-fugitive' +nmap gs :Gstatus +nmap gc :Gcommit +nmap gp :Git push + +Plug 'junegunn/vim-easy-align' +vnoremap :EasyAlign + +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 diff --git a/bundle/Vim-Tomorrow-Theme b/bundle/Vim-Tomorrow-Theme deleted file mode 160000 index 1e0c2ab5..00000000 --- a/bundle/Vim-Tomorrow-Theme +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e0c2ab5d5a82d7adecbc84f689abcf217bd1b50 diff --git a/bundle/base16-vim b/bundle/base16-vim deleted file mode 160000 index 6db489a7..00000000 --- a/bundle/base16-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6db489a71dc0f588d21fbe5e40a257a307bac108 diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim deleted file mode 160000 index b5d3fe66..00000000 --- a/bundle/ctrlp.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/bundle/gist-vim b/bundle/gist-vim deleted file mode 160000 index bd941d05..00000000 --- a/bundle/gist-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd941d058b319e2b7bfc07de584e975a51782cc9 diff --git a/bundle/itchy.vim b/bundle/itchy.vim deleted file mode 160000 index 13bf38ff..00000000 --- a/bundle/itchy.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 13bf38ff895f7c32befb78b9505c478b77545329 diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim deleted file mode 160000 index 0f081269..00000000 --- a/bundle/jellybeans.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0f08126929bce42c5bd9ef6b44008fb338295142 diff --git a/bundle/refheap.vim b/bundle/refheap.vim deleted file mode 160000 index d6d10a4e..00000000 --- a/bundle/refheap.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d6d10a4e1aa8dec536275a3ba6f11fbebbea306b diff --git a/bundle/syntastic b/bundle/syntastic deleted file mode 160000 index 14cb3064..00000000 --- a/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14cb306414dda411b1809a088e18eb2796030095 diff --git a/bundle/tagbar b/bundle/tagbar deleted file mode 160000 index 2e2ba2ea..00000000 --- a/bundle/tagbar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2e2ba2eab252b05051d4ca7cd87b2fcb23a411d6 diff --git a/bundle/vim-airline b/bundle/vim-airline deleted file mode 160000 index 99b7cdf3..00000000 --- a/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99b7cdf334c7e60498b037f45273cc02f85ab6fe diff --git a/bundle/vim-commentary b/bundle/vim-commentary deleted file mode 160000 index a3ae0df1..00000000 --- a/bundle/vim-commentary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a3ae0df1d9e13941e9e8086637055841ce93f7bd diff --git a/bundle/vim-easy-align b/bundle/vim-easy-align deleted file mode 160000 index 2daae46a..00000000 --- a/bundle/vim-easy-align +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2daae46a43f6e7b9022cbde1dd451d4f798f5f72 diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive deleted file mode 160000 index 34e2d253..00000000 --- a/bundle/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 34e2d2538a634a0a820a56994333ffa1fec1bc58 diff --git a/bundle/vim-markdown b/bundle/vim-markdown deleted file mode 160000 index fccf76f6..00000000 --- a/bundle/vim-markdown +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fccf76f68fa819629e9dac50a20f3369983e2a38 diff --git a/bundle/vim-pasta b/bundle/vim-pasta deleted file mode 160000 index 50ac52a3..00000000 --- a/bundle/vim-pasta +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 50ac52a3cc3377395ceb160e3360923d84d0b916 diff --git a/bundle/vim-pathogen b/bundle/vim-pathogen deleted file mode 160000 index 1270dceb..00000000 --- a/bundle/vim-pathogen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1270dceb1fe0ca35f8b292c7b41b45b42c5a0cc1 diff --git a/bundle/vim-ragtag b/bundle/vim-ragtag deleted file mode 160000 index 1a93cbb1..00000000 --- a/bundle/vim-ragtag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1a93cbb14f537c001a52a43b94309d6c625b5953 diff --git a/bundle/vim-signify b/bundle/vim-signify deleted file mode 160000 index ec4d88eb..00000000 --- a/bundle/vim-signify +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ec4d88eb1c5dda97db0fc9e4ddbf33e11faacc39 diff --git a/bundle/webapi-vim b/bundle/webapi-vim deleted file mode 160000 index a043444a..00000000 --- a/bundle/webapi-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a043444a5b7cbcc865e4cee61c118de09ea2cbdc diff --git a/vim-plug.sh b/vim-plug.sh new file mode 100755 index 00000000..0fc9a28c --- /dev/null +++ b/vim-plug.sh @@ -0,0 +1,2 @@ +mkdir -p ~/.vim/autoload +curl -fLo ~/.vim/autoload/plug.vim https://raw.github.com/junegunn/vim-plug/master/plug.vim -- cgit 1.4.1