From d07345bbc31eb943137312d0af6c88c192bbfb57 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 18 Oct 2017 02:17:42 -0400 Subject: use vim 8's built in module system instead of pathogen --- .gitmodules | 41 +++++++++++++++++++---------------------- Makefile | 8 ++++---- vim/bundle/airline | 1 - vim/bundle/bufferline | 1 - vim/bundle/foldtext | 1 - vim/bundle/ft-bzl | 1 - vim/bundle/git | 1 - vim/bundle/go | 1 - vim/bundle/gundo | 1 - vim/bundle/ledger | 1 - vim/bundle/neosnippet | 1 - vim/bundle/pathogen | 1 - vim/bundle/perl | 1 - vim/bundle/puppet | 1 - vim/bundle/rust | 1 - vim/bundle/startify | 1 - vim/bundle/syntastic | 1 - vim/bundle/tcomment | 1 - vim/bundle/textobj | 1 - vim/bundle/unite | 1 - vim/bundle/unite-tag | 1 - vim/bundle/vimproc | 1 - vim/pack/local/start/airline | 1 + vim/pack/local/start/bufferline | 1 + vim/pack/local/start/foldtext | 1 + vim/pack/local/start/ft-bzl | 1 + vim/pack/local/start/git | 1 + vim/pack/local/start/go | 1 + vim/pack/local/start/gundo | 1 + vim/pack/local/start/ledger | 1 + vim/pack/local/start/neosnippet | 1 + vim/pack/local/start/perl | 1 + vim/pack/local/start/puppet | 1 + vim/pack/local/start/rust | 1 + vim/pack/local/start/startify | 1 + vim/pack/local/start/syntastic | 1 + vim/pack/local/start/tcomment | 1 + vim/pack/local/start/textobj | 1 + vim/pack/local/start/unite | 1 + vim/pack/local/start/unite-tag | 1 + vim/pack/local/start/vimproc | 1 + vimrc | 8 ++------ 42 files changed, 44 insertions(+), 52 deletions(-) delete mode 160000 vim/bundle/airline delete mode 160000 vim/bundle/bufferline delete mode 160000 vim/bundle/foldtext delete mode 160000 vim/bundle/ft-bzl delete mode 160000 vim/bundle/git delete mode 160000 vim/bundle/go delete mode 160000 vim/bundle/gundo delete mode 160000 vim/bundle/ledger delete mode 160000 vim/bundle/neosnippet delete mode 160000 vim/bundle/pathogen delete mode 160000 vim/bundle/perl delete mode 160000 vim/bundle/puppet delete mode 160000 vim/bundle/rust delete mode 160000 vim/bundle/startify delete mode 160000 vim/bundle/syntastic delete mode 160000 vim/bundle/tcomment delete mode 160000 vim/bundle/textobj delete mode 160000 vim/bundle/unite delete mode 160000 vim/bundle/unite-tag delete mode 160000 vim/bundle/vimproc create mode 160000 vim/pack/local/start/airline create mode 160000 vim/pack/local/start/bufferline create mode 160000 vim/pack/local/start/foldtext create mode 160000 vim/pack/local/start/ft-bzl create mode 160000 vim/pack/local/start/git create mode 160000 vim/pack/local/start/go create mode 160000 vim/pack/local/start/gundo create mode 160000 vim/pack/local/start/ledger create mode 160000 vim/pack/local/start/neosnippet create mode 160000 vim/pack/local/start/perl create mode 160000 vim/pack/local/start/puppet create mode 160000 vim/pack/local/start/rust create mode 160000 vim/pack/local/start/startify create mode 160000 vim/pack/local/start/syntastic create mode 160000 vim/pack/local/start/tcomment create mode 160000 vim/pack/local/start/textobj create mode 160000 vim/pack/local/start/unite create mode 160000 vim/pack/local/start/unite-tag create mode 160000 vim/pack/local/start/vimproc diff --git a/.gitmodules b/.gitmodules index bdf5794..7fdac5c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,23 +1,20 @@ -[submodule "vim/bundle/pathogen"] - path = vim/bundle/pathogen - url = git://github.com/tpope/vim-pathogen [submodule "vim/bundle/foldtext"] - path = vim/bundle/foldtext + path = vim/pack/local/start/foldtext url = git://github.com/doy/vim-foldtext [submodule "vim/bundle/fuzzyfinder"] path = vim/bundle/fuzzyfinder url = git://github.com/vim-scripts/FuzzyFinder [submodule "vim/bundle/git"] - path = vim/bundle/git + path = vim/pack/local/start/git url = git://github.com/tpope/vim-git [submodule "vim/bundle/gundo"] - path = vim/bundle/gundo + path = vim/pack/local/start/gundo url = git://github.com/sjl/gundo.vim [submodule "vim/bundle/l9"] path = vim/bundle/l9 url = git://github.com/vim-scripts/L9 [submodule "vim/bundle/perl"] - path = vim/bundle/perl + path = vim/pack/local/start/perl url = git://github.com/vim-perl/vim-perl [submodule "vim/bundle/snipmate"] path = vim/bundle/snipmate @@ -26,10 +23,10 @@ path = vim/bundle/supertab url = git://github.com/ervandew/supertab [submodule "vim/bundle/tcomment"] - path = vim/bundle/tcomment + path = vim/pack/local/start/tcomment url = git://github.com/tomtom/tcomment_vim [submodule "vim/bundle/textobj"] - path = vim/bundle/textobj + path = vim/pack/local/start/textobj url = git://github.com/doy/vim-textobj [submodule "zsh/zsh-syntax-highlighting"] path = zsh/zsh-syntax-highlighting @@ -41,31 +38,31 @@ path = vim/bundle/addon-mw-utils url = git://github.com/MarcWeber/vim-addon-mw-utils [submodule "vim/bundle/startify"] - path = vim/bundle/startify + path = vim/pack/local/start/startify url = git://github.com/mhinz/vim-startify [submodule "vim/bundle/unite"] - path = vim/bundle/unite + path = vim/pack/local/start/unite url = git://github.com/Shougo/unite.vim [submodule "vim/bundle/vimproc"] - path = vim/bundle/vimproc + path = vim/pack/local/start/vimproc url = git://github.com/Shougo/vimproc.vim [submodule "vim/bundle/bufferline"] - path = vim/bundle/bufferline + path = vim/pack/local/start/bufferline url = git://github.com/bling/vim-bufferline [submodule "vim/bundle/airline"] - path = vim/bundle/airline + path = vim/pack/local/start/airline url = git://github.com/bling/vim-airline [submodule "vim/bundle/neocomplete"] path = vim/bundle/neocomplete url = git://github.com/Shougo/neocomplete.vim [submodule "vim/bundle/neosnippet"] - path = vim/bundle/neosnippet + path = vim/pack/local/start/neosnippet url = git://github.com/Shougo/neosnippet.vim [submodule "zsh/opp"] path = zsh/opp url = git://github.com/hchbaw/opp.zsh [submodule "vim/bundle/unite-tag"] - path = vim/bundle/unite-tag + path = vim/pack/local/start/unite-tag url = git://github.com/tsukkee/unite-tag [submodule "vim/bundle/typescript"] path = vim/bundle/typescript @@ -74,19 +71,19 @@ path = vim/bundle/julia url = git://github.com/JuliaLang/julia-vim [submodule "vim/bundle/puppet"] - path = vim/bundle/puppet + path = vim/pack/local/start/puppet url = git://github.com/rodjek/vim-puppet [submodule "vim/bundle/syntastic"] - path = vim/bundle/syntastic + path = vim/pack/local/start/syntastic url = git://github.com/scrooloose/syntastic [submodule "vim/bundle/go"] - path = vim/bundle/go + path = vim/pack/local/start/go url = git://github.com/fatih/vim-go [submodule "vim/bundle/rust"] - path = vim/bundle/rust + path = vim/pack/local/start/rust url = git://github.com/rust-lang/rust.vim [submodule "vim/bundle/ft-bzl"] - path = vim/bundle/ft-bzl + path = vim/pack/local/start/ft-bzl url = git://github.com/google/vim-ft-bzl [submodule "zsh/zsh-autosuggestions"] path = zsh/zsh-autosuggestions @@ -101,5 +98,5 @@ path = zsh/anyframe url = git://github.com/mollifier/anyframe [submodule "vim/bundle/ledger"] - path = vim/bundle/ledger + path = vim/pack/local/start/ledger url = git://github.com/ledger/vim-ledger diff --git a/Makefile b/Makefile index 5bd9d40..36030c2 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ INSTALLED = $(patsubst %,$(INTO)/.%,$(INSTALL)) BUILD = bin/local/timettyrec \ $(addsuffix .dat,$(filter-out %.dat,$(wildcard fortune/*))) \ - vim/bundle/vimproc/autoload/vimproc_linux64.so \ + vim/pack/local/start/vimproc/autoload/vimproc_linux64.so \ vim/spell/en.utf-8.add.spl \ less @@ -95,7 +95,7 @@ clean : $(RM) $(BUILD) $(INSTALLED) update : - @git submodule foreach '(if [ $$name == "vim/bundle/perl" ]; then git checkout dev; else git checkout master; fi) && git pull' + @git submodule foreach '(if [ $$name == "vim/pack/local/start/perl" ]; then git checkout dev; else git checkout master; fi) && git pull' @$(MAKE) $(INTO)/.% : % @@ -109,8 +109,8 @@ fortune/%.dat : fortune/% @echo "Compiling $@" @strfile -s $(basename $@) -vim/bundle/vimproc/autoload/vimproc_linux64.so : - cd vim/bundle/vimproc && make +vim/pack/local/start/vimproc/autoload/vimproc_linux64.so : + cd vim/pack/local/start/vimproc && make less : lesskey lesskey -o less lesskey diff --git a/vim/bundle/airline b/vim/bundle/airline deleted file mode 160000 index 27acd85..0000000 --- a/vim/bundle/airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 27acd851a780c563cb4807fc0ea3af9caccbb585 diff --git a/vim/bundle/bufferline b/vim/bundle/bufferline deleted file mode 160000 index 651fd01..0000000 --- a/vim/bundle/bufferline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 651fd010aa9613a4b8636a4af8a2db0d22800262 diff --git a/vim/bundle/foldtext b/vim/bundle/foldtext deleted file mode 160000 index dd25d36..0000000 --- a/vim/bundle/foldtext +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd25d369d3d06170e4987ba46b170df1debc7c4c diff --git a/vim/bundle/ft-bzl b/vim/bundle/ft-bzl deleted file mode 160000 index d7cfe1c..0000000 --- a/vim/bundle/ft-bzl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d7cfe1c770e0c21f6341ba62c77af9f47258294f diff --git a/vim/bundle/git b/vim/bundle/git deleted file mode 160000 index 04c9a9d..0000000 --- a/vim/bundle/git +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04c9a9d1ce06ce8438e55db6c581e94344da3aa1 diff --git a/vim/bundle/go b/vim/bundle/go deleted file mode 160000 index bd5bd98..0000000 --- a/vim/bundle/go +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd5bd982deee77743245058dbcba7cbbb1f1c7b3 diff --git a/vim/bundle/gundo b/vim/bundle/gundo deleted file mode 160000 index 46c443e..0000000 --- a/vim/bundle/gundo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46c443ee9d5854320eb965a1fdee781ba83a070e diff --git a/vim/bundle/ledger b/vim/bundle/ledger deleted file mode 160000 index 0bce2fd..0000000 --- a/vim/bundle/ledger +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bce2fd70da351c65d20cb5a1fec20ad3a2ab904 diff --git a/vim/bundle/neosnippet b/vim/bundle/neosnippet deleted file mode 160000 index ddd01d0..0000000 --- a/vim/bundle/neosnippet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ddd01d0ee3d965d9a30051f2e12b14234c83b3ae diff --git a/vim/bundle/pathogen b/vim/bundle/pathogen deleted file mode 160000 index e7857be..0000000 --- a/vim/bundle/pathogen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7857bed4e0705f91f781dbe99706f07d08d104b diff --git a/vim/bundle/perl b/vim/bundle/perl deleted file mode 160000 index 439fb4a..0000000 --- a/vim/bundle/perl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 439fb4af7bfb70cc9f9b99209a27c76a2259e6bf diff --git a/vim/bundle/puppet b/vim/bundle/puppet deleted file mode 160000 index 0d8ddd0..0000000 --- a/vim/bundle/puppet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3 diff --git a/vim/bundle/rust b/vim/bundle/rust deleted file mode 160000 index b6d88ad..0000000 --- a/vim/bundle/rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b6d88adcf9867aa69f4d20d45d49bb54979842a4 diff --git a/vim/bundle/startify b/vim/bundle/startify deleted file mode 160000 index 7f910ed..0000000 --- a/vim/bundle/startify +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7f910ed4367de96310fedc98d5a12b97173a405f diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic deleted file mode 160000 index 08adf11..0000000 --- a/vim/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 08adf11e81baef2f504d766f8c5b7444b2ee5a6f diff --git a/vim/bundle/tcomment b/vim/bundle/tcomment deleted file mode 160000 index 7cba1bb..0000000 --- a/vim/bundle/tcomment +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7cba1bbc2f8f1da0a854ae80eefc74f3a8402dab diff --git a/vim/bundle/textobj b/vim/bundle/textobj deleted file mode 160000 index d7057e8..0000000 --- a/vim/bundle/textobj +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d7057e8c68f4e0cc400fa193bf915fd4a73b1bc6 diff --git a/vim/bundle/unite b/vim/bundle/unite deleted file mode 160000 index 53d9f34..0000000 --- a/vim/bundle/unite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 53d9f345a02976497cc99a4c7f5e4cf6114b6c28 diff --git a/vim/bundle/unite-tag b/vim/bundle/unite-tag deleted file mode 160000 index 4785851..0000000 --- a/vim/bundle/unite-tag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 478585124a52bea51344bc61f4b9a85a791591ac diff --git a/vim/bundle/vimproc b/vim/bundle/vimproc deleted file mode 160000 index 03a38f2..0000000 --- a/vim/bundle/vimproc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03a38f283ca9e15784e8fea84e8afc5d633b9639 diff --git a/vim/pack/local/start/airline b/vim/pack/local/start/airline new file mode 160000 index 0000000..27acd85 --- /dev/null +++ b/vim/pack/local/start/airline @@ -0,0 +1 @@ +Subproject commit 27acd851a780c563cb4807fc0ea3af9caccbb585 diff --git a/vim/pack/local/start/bufferline b/vim/pack/local/start/bufferline new file mode 160000 index 0000000..651fd01 --- /dev/null +++ b/vim/pack/local/start/bufferline @@ -0,0 +1 @@ +Subproject commit 651fd010aa9613a4b8636a4af8a2db0d22800262 diff --git a/vim/pack/local/start/foldtext b/vim/pack/local/start/foldtext new file mode 160000 index 0000000..dd25d36 --- /dev/null +++ b/vim/pack/local/start/foldtext @@ -0,0 +1 @@ +Subproject commit dd25d369d3d06170e4987ba46b170df1debc7c4c diff --git a/vim/pack/local/start/ft-bzl b/vim/pack/local/start/ft-bzl new file mode 160000 index 0000000..d7cfe1c --- /dev/null +++ b/vim/pack/local/start/ft-bzl @@ -0,0 +1 @@ +Subproject commit d7cfe1c770e0c21f6341ba62c77af9f47258294f diff --git a/vim/pack/local/start/git b/vim/pack/local/start/git new file mode 160000 index 0000000..04c9a9d --- /dev/null +++ b/vim/pack/local/start/git @@ -0,0 +1 @@ +Subproject commit 04c9a9d1ce06ce8438e55db6c581e94344da3aa1 diff --git a/vim/pack/local/start/go b/vim/pack/local/start/go new file mode 160000 index 0000000..bd5bd98 --- /dev/null +++ b/vim/pack/local/start/go @@ -0,0 +1 @@ +Subproject commit bd5bd982deee77743245058dbcba7cbbb1f1c7b3 diff --git a/vim/pack/local/start/gundo b/vim/pack/local/start/gundo new file mode 160000 index 0000000..46c443e --- /dev/null +++ b/vim/pack/local/start/gundo @@ -0,0 +1 @@ +Subproject commit 46c443ee9d5854320eb965a1fdee781ba83a070e diff --git a/vim/pack/local/start/ledger b/vim/pack/local/start/ledger new file mode 160000 index 0000000..0bce2fd --- /dev/null +++ b/vim/pack/local/start/ledger @@ -0,0 +1 @@ +Subproject commit 0bce2fd70da351c65d20cb5a1fec20ad3a2ab904 diff --git a/vim/pack/local/start/neosnippet b/vim/pack/local/start/neosnippet new file mode 160000 index 0000000..ddd01d0 --- /dev/null +++ b/vim/pack/local/start/neosnippet @@ -0,0 +1 @@ +Subproject commit ddd01d0ee3d965d9a30051f2e12b14234c83b3ae diff --git a/vim/pack/local/start/perl b/vim/pack/local/start/perl new file mode 160000 index 0000000..439fb4a --- /dev/null +++ b/vim/pack/local/start/perl @@ -0,0 +1 @@ +Subproject commit 439fb4af7bfb70cc9f9b99209a27c76a2259e6bf diff --git a/vim/pack/local/start/puppet b/vim/pack/local/start/puppet new file mode 160000 index 0000000..0d8ddd0 --- /dev/null +++ b/vim/pack/local/start/puppet @@ -0,0 +1 @@ +Subproject commit 0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3 diff --git a/vim/pack/local/start/rust b/vim/pack/local/start/rust new file mode 160000 index 0000000..b6d88ad --- /dev/null +++ b/vim/pack/local/start/rust @@ -0,0 +1 @@ +Subproject commit b6d88adcf9867aa69f4d20d45d49bb54979842a4 diff --git a/vim/pack/local/start/startify b/vim/pack/local/start/startify new file mode 160000 index 0000000..7f910ed --- /dev/null +++ b/vim/pack/local/start/startify @@ -0,0 +1 @@ +Subproject commit 7f910ed4367de96310fedc98d5a12b97173a405f diff --git a/vim/pack/local/start/syntastic b/vim/pack/local/start/syntastic new file mode 160000 index 0000000..08adf11 --- /dev/null +++ b/vim/pack/local/start/syntastic @@ -0,0 +1 @@ +Subproject commit 08adf11e81baef2f504d766f8c5b7444b2ee5a6f diff --git a/vim/pack/local/start/tcomment b/vim/pack/local/start/tcomment new file mode 160000 index 0000000..7cba1bb --- /dev/null +++ b/vim/pack/local/start/tcomment @@ -0,0 +1 @@ +Subproject commit 7cba1bbc2f8f1da0a854ae80eefc74f3a8402dab diff --git a/vim/pack/local/start/textobj b/vim/pack/local/start/textobj new file mode 160000 index 0000000..d7057e8 --- /dev/null +++ b/vim/pack/local/start/textobj @@ -0,0 +1 @@ +Subproject commit d7057e8c68f4e0cc400fa193bf915fd4a73b1bc6 diff --git a/vim/pack/local/start/unite b/vim/pack/local/start/unite new file mode 160000 index 0000000..53d9f34 --- /dev/null +++ b/vim/pack/local/start/unite @@ -0,0 +1 @@ +Subproject commit 53d9f345a02976497cc99a4c7f5e4cf6114b6c28 diff --git a/vim/pack/local/start/unite-tag b/vim/pack/local/start/unite-tag new file mode 160000 index 0000000..4785851 --- /dev/null +++ b/vim/pack/local/start/unite-tag @@ -0,0 +1 @@ +Subproject commit 478585124a52bea51344bc61f4b9a85a791591ac diff --git a/vim/pack/local/start/vimproc b/vim/pack/local/start/vimproc new file mode 160000 index 0000000..03a38f2 --- /dev/null +++ b/vim/pack/local/start/vimproc @@ -0,0 +1 @@ +Subproject commit 03a38f283ca9e15784e8fea84e8afc5d633b9639 diff --git a/vimrc b/vimrc index 55321ee..cb7ba7f 100644 --- a/vimrc +++ b/vimrc @@ -1,9 +1,5 @@ " based on Eidolos's .vimrc, at http://sartak.org/conf/vimrc -" pathogen {{{ -runtime bundle/pathogen/autoload/pathogen.vim -call pathogen#infect() -" }}} " General options {{{ " Miscellaneous {{{ set nocompatible @@ -778,8 +774,8 @@ let rec_exclude = '\(' if filereadable("dist.ini") let rec_exclude .= '\|^' . fnamemodify('.', ':p:h:t') . '-' endif -call unite#custom#source('file_rec/async', 'ignore_pattern', rec_exclude) -call unite#custom#source('file_rec/async', 'converters', ['converter_relative_word']) +autocmd VimEnter call unite#custom#source('file_rec/async', 'ignore_pattern', rec_exclude) +autocmd VimEnter call unite#custom#source('file_rec/async', 'converters', ['converter_relative_word']) autocmd FileType unite call s:unite_my_settings() function! s:unite_my_settings() nmap \ (unite_exit) -- cgit v1.2.3-54-g00ecf