gebner/etc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vimrc: switch to vim-plug

Browse Source 
automatically building youcompleteme works now!
This commit is contained in:
Gabriel Ebner 2014-10-09 11:36:13 +02:00
parent bbc539c11a
commit 136c793d58
2 changed files with 45 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -4,7 +4,7 @@ FILES2 = msmtprc
.PHONY: install clean check .PHONY: install clean check
install: install-conf install-vim-neobundle install: install-conf install-vim-plug
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
@ -14,7 +14,7 @@ install-conf:
cp vimrc $(HOME)\_vimrc cp vimrc $(HOME)\_vimrc
cp gvimrc $(HOME)\_gvimrc cp gvimrc $(HOME)\_gvimrc
VIM_BUNDLE_DIR = $(HOME)/vimfiles/bundle VIM_DIR = $(HOME)/vimfiles
else else
@ -26,13 +26,14 @@ install-conf: $(FILES)
check: $(FILES) check: $(FILES)
for i in $(FILES); do diff -u ~/.$$i $$i; done for i in $(FILES); do diff -u ~/.$$i $$i; done
VIM_BUNDLE_DIR = $(HOME)/.vim/bundle VIM_DIR = $(HOME)/.vim
endif endif
install-vim-neobundle: install-vim-plug:
mkdir -p $(VIM_BUNDLE_DIR) mkdir -p $(VIM_DIR)/autoload
test -d $(VIM_BUNDLE_DIR)/neobundle.vim || git clone https://github.com/Shougo/neobundle.vim.git $(VIM_BUNDLE_DIR)/neobundle.vim test -f $(VIM_DIR)/autoload/plug.vim || curl -fLo ~/.vim/autoload/plug.vim \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
clean: clean:

90
vimrc
View File

@ -1,82 +1,68 @@
se nocompatible se nocompatible
filetype off filetype off
se rtp+=~/.vim/bundle/neobundle.vim call plug#begin('~/.vim/plugged')
call neobundle#begin(expand('~/.vim/bundle/'))
NeoBundleFetch 'Shougo/neobundle.vim' Plug 'tpope/vim-sensible'
NeoBundle 'tpope/vim-sensible' Plug 'Valloric/YouCompleteMe', { 'do': './install.sh --clang-completer --system-libclang' }
NeoBundle 'Valloric/YouCompleteMe' , { Plug 'Shougo/vimproc.vim' , { 'do': 'make -f make_unix.mak' }
\ 'build' : {
\ 'unix' : './install.sh --clang-completer --system-libclang'
\ },
\ }
NeoBundle 'Shougo/vimproc.vim' , { Plug 'Shougo/unite.vim'
\ 'build' : { Plug 'tsukkee/unite-tag'
\ 'windows' : 'make -f make_mingw32.mak', Plug 'Shougo/neomru.vim'
\ 'cygwin' : 'make -f make_cygwin.mak',
\ 'mac' : 'make -f make_mac.mak',
\ 'unix' : 'make -f make_unix.mak',
\ },
\ }
NeoBundle 'Shougo/unite.vim' Plug 'ciaranm/securemodelines'
NeoBundle 'tsukkee/unite-tag'
NeoBundle 'Shougo/neomru.vim'
NeoBundle 'ciaranm/securemodelines' Plug 'chrisbra/SudoEdit.vim'
NeoBundle 'chrisbra/SudoEdit.vim' Plug 'nanotech/jellybeans.vim'
Plug 'majutsushi/tagbar'
Plug 'bling/vim-airline'
Plug 'scrooloose/syntastic'
Plug 'tomtom/tcomment_vim'
"Plug 'Raimondi/delimitMate'
NeoBundle 'nanotech/jellybeans.vim' Plug 'editorconfig/editorconfig-vim'
NeoBundle 'majutsushi/tagbar'
NeoBundle 'bling/vim-airline'
NeoBundle 'scrooloose/syntastic'
NeoBundle 'tomtom/tcomment_vim'
"NeoBundle 'Raimondi/delimitMate'
NeoBundle 'editorconfig/editorconfig-vim' Plug 'kchmck/vim-coffee-script'
Plug 'ledger/vim-ledger'
NeoBundle 'kchmck/vim-coffee-script' Plug 'dag/vim2hs'
NeoBundle 'ledger/vim-ledger' Plug 'eagletmt/ghcmod-vim'
Plug 'eagletmt/neco-ghc'
NeoBundle 'dag/vim2hs' Plug 'tpope/vim-fireplace' " clojure repl
NeoBundle 'eagletmt/ghcmod-vim'
NeoBundle 'eagletmt/neco-ghc'
NeoBundle 'tpope/vim-fireplace' " clojure repl Plug 'marijnh/tern_for_vim'
NeoBundle 'marijnh/tern_for_vim' Plug 'jnwhiteh/vim-golang'
Plug 'Blackrush/vim-gocode'
NeoBundle 'jnwhiteh/vim-golang' Plug 'zah/nimrod.vim'
NeoBundle 'Blackrush/vim-gocode'
NeoBundle 'zah/nimrod.vim' Plug 'wting/rust.vim'
NeoBundle 'wting/rust.vim' Plug 'derekwyatt/vim-scala'
NeoBundle 'derekwyatt/vim-scala' Plug 'othree/html5.vim'
NeoBundle 'othree/html5.vim' Plug 'dogrover/vim-pentadactyl'
Plug 'superbrothers/vim-vimperator'
NeoBundle 'dogrover/vim-pentadactyl' Plug 'idris-hackers/idris-vim'
NeoBundle 'superbrothers/vim-vimperator'
NeoBundle 'idris-hackers/idris-vim' Plug 'tpope/vim-fugitive' " git integration
NeoBundle 'tpope/vim-fugitive' " git integration Plug 'kana/vim-textobj-user'
Plug 'rbonvall/vim-textobj-latex'
NeoBundle 'kana/vim-textobj-user' Plug 'kana/vim-textobj-indent'
NeoBundle 'rbonvall/vim-textobj-latex' Plug 'bps/vim-textobj-python'
NeoBundle 'kana/vim-textobj-indent'
NeoBundle 'bps/vim-textobj-python'
" vim-sleuth? " vim-sleuth?
call neobundle#end() call plug#end()
filetype plugin indent on filetype plugin indent on