diff options
| -rw-r--r-- | .gitmodules | 41 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| m--------- | vim/bundle/pathogen | 0 | ||||
| m--------- | vim/pack/local/start/airline (renamed from vim/bundle/airline) | 0 | ||||
| m--------- | vim/pack/local/start/bufferline (renamed from vim/bundle/bufferline) | 0 | ||||
| m--------- | vim/pack/local/start/foldtext (renamed from vim/bundle/foldtext) | 0 | ||||
| m--------- | vim/pack/local/start/ft-bzl (renamed from vim/bundle/ft-bzl) | 0 | ||||
| m--------- | vim/pack/local/start/git (renamed from vim/bundle/git) | 0 | ||||
| m--------- | vim/pack/local/start/go (renamed from vim/bundle/go) | 0 | ||||
| m--------- | vim/pack/local/start/gundo (renamed from vim/bundle/gundo) | 0 | ||||
| m--------- | vim/pack/local/start/ledger (renamed from vim/bundle/ledger) | 0 | ||||
| m--------- | vim/pack/local/start/neosnippet (renamed from vim/bundle/neosnippet) | 0 | ||||
| m--------- | vim/pack/local/start/perl (renamed from vim/bundle/perl) | 0 | ||||
| m--------- | vim/pack/local/start/puppet (renamed from vim/bundle/puppet) | 0 | ||||
| m--------- | vim/pack/local/start/rust (renamed from vim/bundle/rust) | 0 | ||||
| m--------- | vim/pack/local/start/startify (renamed from vim/bundle/startify) | 0 | ||||
| m--------- | vim/pack/local/start/syntastic (renamed from vim/bundle/syntastic) | 0 | ||||
| m--------- | vim/pack/local/start/tcomment (renamed from vim/bundle/tcomment) | 0 | ||||
| m--------- | vim/pack/local/start/textobj (renamed from vim/bundle/textobj) | 0 | ||||
| m--------- | vim/pack/local/start/unite (renamed from vim/bundle/unite) | 0 | ||||
| m--------- | vim/pack/local/start/unite-tag (renamed from vim/bundle/unite-tag) | 0 | ||||
| m--------- | vim/pack/local/start/vimproc (renamed from vim/bundle/vimproc) | 0 | ||||
| -rw-r--r-- | vimrc | 8 |
23 files changed, 25 insertions, 32 deletions
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 @@ -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/pathogen b/vim/bundle/pathogen deleted file mode 160000 -Subproject e7857bed4e0705f91f781dbe99706f07d08d104 diff --git a/vim/bundle/airline b/vim/pack/local/start/airline -Subproject 27acd851a780c563cb4807fc0ea3af9caccbb58 +Subproject 27acd851a780c563cb4807fc0ea3af9caccbb58 diff --git a/vim/bundle/bufferline b/vim/pack/local/start/bufferline -Subproject 651fd010aa9613a4b8636a4af8a2db0d2280026 +Subproject 651fd010aa9613a4b8636a4af8a2db0d2280026 diff --git a/vim/bundle/foldtext b/vim/pack/local/start/foldtext -Subproject dd25d369d3d06170e4987ba46b170df1debc7c4 +Subproject dd25d369d3d06170e4987ba46b170df1debc7c4 diff --git a/vim/bundle/ft-bzl b/vim/pack/local/start/ft-bzl -Subproject d7cfe1c770e0c21f6341ba62c77af9f47258294 +Subproject d7cfe1c770e0c21f6341ba62c77af9f47258294 diff --git a/vim/bundle/git b/vim/pack/local/start/git -Subproject 04c9a9d1ce06ce8438e55db6c581e94344da3aa +Subproject 04c9a9d1ce06ce8438e55db6c581e94344da3aa diff --git a/vim/bundle/go b/vim/pack/local/start/go -Subproject bd5bd982deee77743245058dbcba7cbbb1f1c7b +Subproject bd5bd982deee77743245058dbcba7cbbb1f1c7b diff --git a/vim/bundle/gundo b/vim/pack/local/start/gundo -Subproject 46c443ee9d5854320eb965a1fdee781ba83a070 +Subproject 46c443ee9d5854320eb965a1fdee781ba83a070 diff --git a/vim/bundle/ledger b/vim/pack/local/start/ledger -Subproject 0bce2fd70da351c65d20cb5a1fec20ad3a2ab90 +Subproject 0bce2fd70da351c65d20cb5a1fec20ad3a2ab90 diff --git a/vim/bundle/neosnippet b/vim/pack/local/start/neosnippet -Subproject ddd01d0ee3d965d9a30051f2e12b14234c83b3a +Subproject ddd01d0ee3d965d9a30051f2e12b14234c83b3a diff --git a/vim/bundle/perl b/vim/pack/local/start/perl -Subproject 439fb4af7bfb70cc9f9b99209a27c76a2259e6b +Subproject 439fb4af7bfb70cc9f9b99209a27c76a2259e6b diff --git a/vim/bundle/puppet b/vim/pack/local/start/puppet -Subproject 0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e +Subproject 0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e diff --git a/vim/bundle/rust b/vim/pack/local/start/rust -Subproject b6d88adcf9867aa69f4d20d45d49bb54979842a +Subproject b6d88adcf9867aa69f4d20d45d49bb54979842a diff --git a/vim/bundle/startify b/vim/pack/local/start/startify -Subproject 7f910ed4367de96310fedc98d5a12b97173a405 +Subproject 7f910ed4367de96310fedc98d5a12b97173a405 diff --git a/vim/bundle/syntastic b/vim/pack/local/start/syntastic -Subproject 08adf11e81baef2f504d766f8c5b7444b2ee5a6 +Subproject 08adf11e81baef2f504d766f8c5b7444b2ee5a6 diff --git a/vim/bundle/tcomment b/vim/pack/local/start/tcomment -Subproject 7cba1bbc2f8f1da0a854ae80eefc74f3a8402da +Subproject 7cba1bbc2f8f1da0a854ae80eefc74f3a8402da diff --git a/vim/bundle/textobj b/vim/pack/local/start/textobj -Subproject d7057e8c68f4e0cc400fa193bf915fd4a73b1bc +Subproject d7057e8c68f4e0cc400fa193bf915fd4a73b1bc diff --git a/vim/bundle/unite b/vim/pack/local/start/unite -Subproject 53d9f345a02976497cc99a4c7f5e4cf6114b6c2 +Subproject 53d9f345a02976497cc99a4c7f5e4cf6114b6c2 diff --git a/vim/bundle/unite-tag b/vim/pack/local/start/unite-tag -Subproject 478585124a52bea51344bc61f4b9a85a791591a +Subproject 478585124a52bea51344bc61f4b9a85a791591a diff --git a/vim/bundle/vimproc b/vim/pack/local/start/vimproc -Subproject 03a38f283ca9e15784e8fea84e8afc5d633b963 +Subproject 03a38f283ca9e15784e8fea84e8afc5d633b963 @@ -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 <silent><buffer> \ <Plug>(unite_exit) |