Merge branch 'master' of git.gebner.org:etc

Makefile

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

vimrc

@@ -1,80 +1,68 @@
 se nocompatible
 filetype off
 
-se rtp+=~/.vim/bundle/neobundle.vim
-call neobundle#begin(expand('~/.vim/bundle/'))
+call plug#begin('~/.vim/plugged')
 
-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' , {
-      \ 'build' : {
-      \     'unix' : './install.sh --clang-completer --system-libclang'
-      \   },
-      \ }
+Plug 'Shougo/vimproc.vim' , { 'do': 'make -f make_unix.mak' }
 
-NeoBundle 'Shougo/vimproc.vim' , {
-      \ 'build' : {
-      \     'windows' : 'make -f make_mingw32.mak',
-      \     'cygwin' : 'make -f make_cygwin.mak',
-      \     'mac' : 'make -f make_mac.mak',
-      \     'unix' : 'make -f make_unix.mak',
-      \   },
-      \ }
+Plug 'Shougo/unite.vim'
+Plug 'tsukkee/unite-tag'
+Plug 'Shougo/neomru.vim'
 
-NeoBundle 'Shougo/unite.vim'
-NeoBundle 'tsukkee/unite-tag'
-NeoBundle 'Shougo/neomru.vim'
+Plug 'ciaranm/securemodelines'
 
-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'
-NeoBundle 'majutsushi/tagbar'
-NeoBundle 'bling/vim-airline'
-NeoBundle 'scrooloose/syntastic'
-NeoBundle 'tomtom/tcomment_vim'
-"NeoBundle 'Raimondi/delimitMate'
+Plug 'editorconfig/editorconfig-vim'
 
-NeoBundle 'editorconfig/editorconfig-vim'
+Plug 'kchmck/vim-coffee-script'
+Plug 'ledger/vim-ledger'
 
-NeoBundle 'kchmck/vim-coffee-script'
-NeoBundle 'ledger/vim-ledger'
+Plug 'dag/vim2hs'
+Plug 'eagletmt/ghcmod-vim'
+Plug 'eagletmt/neco-ghc'
 
-NeoBundle 'dag/vim2hs'
-NeoBundle 'eagletmt/ghcmod-vim'
-NeoBundle 'eagletmt/neco-ghc'
+Plug 'tpope/vim-fireplace' " clojure repl
 
-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'
-NeoBundle 'Blackrush/vim-gocode'
+Plug 'zah/nimrod.vim'
 
-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'
-NeoBundle 'superbrothers/vim-vimperator'
+Plug 'idris-hackers/idris-vim'
 
-NeoBundle 'idris-hackers/idris-vim'
+Plug 'tpope/vim-fugitive' " git integration
 
-NeoBundle 'tpope/vim-fugitive' " git integration
-
-NeoBundle 'kana/vim-textobj-user'
-NeoBundle 'rbonvall/vim-textobj-latex'
+Plug 'kana/vim-textobj-user'
+Plug 'rbonvall/vim-textobj-latex'
+Plug 'kana/vim-textobj-indent'
+Plug 'bps/vim-textobj-python'
 
 " vim-sleuth?
 
-call neobundle#end()
+call plug#end()
 
 filetype plugin indent on