From 7f916d37ca41af80fe1b6366bf716de4f42b245e Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Wed, 28 Oct 2020 19:59:38 -0700 Subject: [PATCH] Move from pathogen to pack --- .gitmodules | 83 +++++++++---------- .vim/bundle/vim-fugitive | 1 - .../{bundle => pack/plugins/start}/ListToggle | 0 .vim/{bundle => pack/plugins/start}/ale | 0 .../plugins/start}/deoplete.nvim | 0 .vim/{bundle => pack/plugins/start}/fzf | 0 .vim/{bundle => pack/plugins/start}/fzf.vim | 0 .vim/{bundle => pack/plugins/start}/html5.vim | 0 .vim/{bundle => pack/plugins/start}/nvim-yarp | 0 .vim/{bundle => pack/plugins/start}/rust.vim | 0 .../plugins/start}/tcomment_vim | 0 .../plugins/start}/vim-abolish | 0 .../plugins/start}/vim-airline | 0 .../plugins/start}/vim-airline-themes | 0 .vim/{bundle => pack/plugins/start}/vim-angry | 0 .../plugins/start}/vim-argwrap | 0 .vim/{bundle => pack/plugins/start}/vim-bbye | 0 .../plugins/start}/vim-better-whitespace | 0 .../plugins/start}/vim-bufonly | 0 .../plugins/start}/vim-dirvish | 0 .../plugins/start}/vim-easy-align | 0 .../{bundle => pack/plugins/start}/vim-eunuch | 0 .../plugins/start}/vim-fswitch | 0 .vim/{bundle => pack/plugins/start}/vim-go | 0 .../{bundle => pack/plugins/start}/vim-header | 0 .../plugins/start}/vim-hug-neovim-rpc | 0 .../plugins/start}/vim-indent-guides | 0 .../plugins/start}/vim-indent-object | 0 .../plugins/start}/vim-interestingwords | 0 .../plugins/start}/vim-javascript | 0 .../{bundle => pack/plugins/start}/vim-jdaddy | 0 .../plugins/start}/vim-markdown | 0 .../plugins/start}/vim-pathogen | 0 .../{bundle => pack/plugins/start}/vim-repeat | 0 .../{bundle => pack/plugins/start}/vim-rooter | 0 .../plugins/start}/vim-signify | 0 .../plugins/start}/vim-solarized8 | 0 .../plugins/start}/vim-sort-motion | 0 .../plugins/start}/vim-speeddating | 0 .../plugins/start}/vim-surround | 0 .vim/{bundle => pack/plugins/start}/vim-toml | 0 .../plugins/start}/vim-unimpaired | 0 .vim/plugins.vim | 5 -- 43 files changed, 40 insertions(+), 49 deletions(-) delete mode 160000 .vim/bundle/vim-fugitive rename .vim/{bundle => pack/plugins/start}/ListToggle (100%) rename .vim/{bundle => pack/plugins/start}/ale (100%) rename .vim/{bundle => pack/plugins/start}/deoplete.nvim (100%) rename .vim/{bundle => pack/plugins/start}/fzf (100%) rename .vim/{bundle => pack/plugins/start}/fzf.vim (100%) rename .vim/{bundle => pack/plugins/start}/html5.vim (100%) rename .vim/{bundle => pack/plugins/start}/nvim-yarp (100%) rename .vim/{bundle => pack/plugins/start}/rust.vim (100%) rename .vim/{bundle => pack/plugins/start}/tcomment_vim (100%) rename .vim/{bundle => pack/plugins/start}/vim-abolish (100%) rename .vim/{bundle => pack/plugins/start}/vim-airline (100%) rename .vim/{bundle => pack/plugins/start}/vim-airline-themes (100%) rename .vim/{bundle => pack/plugins/start}/vim-angry (100%) rename .vim/{bundle => pack/plugins/start}/vim-argwrap (100%) rename .vim/{bundle => pack/plugins/start}/vim-bbye (100%) rename .vim/{bundle => pack/plugins/start}/vim-better-whitespace (100%) rename .vim/{bundle => pack/plugins/start}/vim-bufonly (100%) rename .vim/{bundle => pack/plugins/start}/vim-dirvish (100%) rename .vim/{bundle => pack/plugins/start}/vim-easy-align (100%) rename .vim/{bundle => pack/plugins/start}/vim-eunuch (100%) rename .vim/{bundle => pack/plugins/start}/vim-fswitch (100%) rename .vim/{bundle => pack/plugins/start}/vim-go (100%) rename .vim/{bundle => pack/plugins/start}/vim-header (100%) rename .vim/{bundle => pack/plugins/start}/vim-hug-neovim-rpc (100%) rename .vim/{bundle => pack/plugins/start}/vim-indent-guides (100%) rename .vim/{bundle => pack/plugins/start}/vim-indent-object (100%) rename .vim/{bundle => pack/plugins/start}/vim-interestingwords (100%) rename .vim/{bundle => pack/plugins/start}/vim-javascript (100%) rename .vim/{bundle => pack/plugins/start}/vim-jdaddy (100%) rename .vim/{bundle => pack/plugins/start}/vim-markdown (100%) rename .vim/{bundle => pack/plugins/start}/vim-pathogen (100%) rename .vim/{bundle => pack/plugins/start}/vim-repeat (100%) rename .vim/{bundle => pack/plugins/start}/vim-rooter (100%) rename .vim/{bundle => pack/plugins/start}/vim-signify (100%) rename .vim/{bundle => pack/plugins/start}/vim-solarized8 (100%) rename .vim/{bundle => pack/plugins/start}/vim-sort-motion (100%) rename .vim/{bundle => pack/plugins/start}/vim-speeddating (100%) rename .vim/{bundle => pack/plugins/start}/vim-surround (100%) rename .vim/{bundle => pack/plugins/start}/vim-toml (100%) rename .vim/{bundle => pack/plugins/start}/vim-unimpaired (100%) diff --git a/.gitmodules b/.gitmodules index b58995d..262c44a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,123 +1,120 @@ [submodule ".vim/bundle/vim-pathogen"] - path = .vim/bundle/vim-pathogen + path = .vim/pack/plugins/start/vim-pathogen url = https://github.com/tpope/vim-pathogen.git [submodule ".vim/bundle/vim-argwrap"] - path = .vim/bundle/vim-argwrap + path = .vim/pack/plugins/start/vim-argwrap url = https://github.com/FooSoft/vim-argwrap.git [submodule ".vim/bundle/vim-toml"] - path = .vim/bundle/vim-toml + path = .vim/pack/plugins/start/vim-toml url = https://github.com/cespare/vim-toml.git [submodule ".vim/bundle/vim-sort-motion"] - path = .vim/bundle/vim-sort-motion + path = .vim/pack/plugins/start/vim-sort-motion url = https://github.com/christoomey/vim-sort-motion.git [submodule ".vim/bundle/vim-fswitch"] - path = .vim/bundle/vim-fswitch + path = .vim/pack/plugins/start/vim-fswitch url = https://github.com/derekwyatt/vim-fswitch.git [submodule ".vim/bundle/vim-go"] - path = .vim/bundle/vim-go + path = .vim/pack/plugins/start/vim-go url = https://github.com/fatih/vim-go.git [submodule ".vim/bundle/vim-easy-align"] - path = .vim/bundle/vim-easy-align + path = .vim/pack/plugins/start/vim-easy-align url = https://github.com/junegunn/vim-easy-align.git [submodule ".vim/bundle/vim-indent-object"] - path = .vim/bundle/vim-indent-object + path = .vim/pack/plugins/start/vim-indent-object url = https://github.com/michaeljsmith/vim-indent-object.git [submodule ".vim/bundle/vim-bbye"] - path = .vim/bundle/vim-bbye + path = .vim/pack/plugins/start/vim-bbye url = https://github.com/moll/vim-bbye.git [submodule ".vim/bundle/vim-better-whitespace"] - path = .vim/bundle/vim-better-whitespace + path = .vim/pack/plugins/start/vim-better-whitespace url = https://github.com/ntpeters/vim-better-whitespace.git [submodule ".vim/bundle/html5.vim"] - path = .vim/bundle/html5.vim + path = .vim/pack/plugins/start/html5.vim url = https://github.com/othree/html5.vim.git [submodule ".vim/bundle/vim-javascript"] - path = .vim/bundle/vim-javascript + path = .vim/pack/plugins/start/vim-javascript url = https://github.com/pangloss/vim-javascript.git [submodule ".vim/bundle/vim-markdown"] - path = .vim/bundle/vim-markdown + path = .vim/pack/plugins/start/vim-markdown url = https://github.com/plasticboy/vim-markdown.git [submodule ".vim/bundle/vim-bufonly"] - path = .vim/bundle/vim-bufonly + path = .vim/pack/plugins/start/vim-bufonly url = https://github.com/schickling/vim-bufonly.git [submodule ".vim/bundle/vim-abolish"] - path = .vim/bundle/vim-abolish + path = .vim/pack/plugins/start/vim-abolish url = https://github.com/tpope/vim-abolish.git [submodule ".vim/bundle/vim-eunuch"] - path = .vim/bundle/vim-eunuch + path = .vim/pack/plugins/start/vim-eunuch url = https://github.com/tpope/vim-eunuch.git -[submodule ".vim/bundle/vim-fugitive"] - path = .vim/bundle/vim-fugitive - url = https://github.com/tpope/vim-fugitive.git [submodule ".vim/bundle/vim-repeat"] - path = .vim/bundle/vim-repeat + path = .vim/pack/plugins/start/vim-repeat url = https://github.com/tpope/vim-repeat [submodule ".vim/bundle/vim-speeddating"] - path = .vim/bundle/vim-speeddating + path = .vim/pack/plugins/start/vim-speeddating url = https://github.com/tpope/vim-speeddating.git [submodule ".vim/bundle/vim-surround"] - path = .vim/bundle/vim-surround + path = .vim/pack/plugins/start/vim-surround url = https://github.com/tpope/vim-surround [submodule ".vim/bundle/vim-unimpaired"] - path = .vim/bundle/vim-unimpaired + path = .vim/pack/plugins/start/vim-unimpaired url = https://github.com/tpope/vim-unimpaired.git [submodule ".vim/bundle/vim-interestingwords"] - path = .vim/bundle/vim-interestingwords + path = .vim/pack/plugins/start/vim-interestingwords url = https://github.com/vasconcelloslf/vim-interestingwords.git [submodule ".vim/bundle/vim-airline-themes"] - path = .vim/bundle/vim-airline-themes + path = .vim/pack/plugins/start/vim-airline-themes url = https://github.com/vim-airline/vim-airline-themes.git [submodule ".vim/bundle/vim-airline"] - path = .vim/bundle/vim-airline + path = .vim/pack/plugins/start/vim-airline url = https://github.com/vim-airline/vim-airline.git [submodule ".vim/bundle/vim-indent-guides"] - path = .vim/bundle/vim-indent-guides + path = .vim/pack/plugins/start/vim-indent-guides url = https://github.com/nathanaelkane/vim-indent-guides.git [submodule ".vim/bundle/vim-jdaddy"] - path = .vim/bundle/vim-jdaddy + path = .vim/pack/plugins/start/vim-jdaddy url = https://github.com/tpope/vim-jdaddy.git [submodule ".vim/bundle/vim-rooter"] - path = .vim/bundle/vim-rooter + path = .vim/pack/plugins/start/vim-rooter url = https://github.com/airblade/vim-rooter.git [submodule ".vim/bundle/vim-dirvish"] - path = .vim/bundle/vim-dirvish + path = .vim/pack/plugins/start/vim-dirvish url = https://github.com/justinmk/vim-dirvish.git [submodule ".vim/bundle/vim-signify"] - path = .vim/bundle/vim-signify + path = .vim/pack/plugins/start/vim-signify url = https://github.com/mhinz/vim-signify.git [submodule ".vim/bundle/fzf"] - path = .vim/bundle/fzf + path = .vim/pack/plugins/start/fzf url = https://github.com/junegunn/fzf [submodule ".vim/bundle/fzf.vim"] - path = .vim/bundle/fzf.vim + path = .vim/pack/plugins/start/fzf.vim url = https://github.com/junegunn/fzf.vim.git [submodule ".vim/bundle_extra/deoplete.nvim"] - path = .vim/bundle/deoplete.nvim + path = .vim/pack/plugins/start/deoplete.nvim url = https://github.com/Shougo/deoplete.nvim.git [submodule ".vim/bundle_extra/nvim-yarp"] - path = .vim/bundle/nvim-yarp + path = .vim/pack/plugins/start/nvim-yarp url = https://github.com/roxma/nvim-yarp.git [submodule ".vim/bundle_extra/vim-hug-neovim-rpc"] - path = .vim/bundle/vim-hug-neovim-rpc + path = .vim/pack/plugins/start/vim-hug-neovim-rpc url = https://github.com/roxma/vim-hug-neovim-rpc [submodule ".vim/bundle/tcomment_vim"] - path = .vim/bundle/tcomment_vim + path = .vim/pack/plugins/start/tcomment_vim url = https://github.com/tomtom/tcomment_vim [submodule ".vim/bundle/vim-header"] - path = .vim/bundle/vim-header + path = .vim/pack/plugins/start/vim-header url = https://github.com/alpertuna/vim-header.git [submodule ".vim/bundle/vim-angry"] - path = .vim/bundle/vim-angry + path = .vim/pack/plugins/start/vim-angry url = https://github.com/b4winckler/vim-angry.git [submodule ".vim/bundle/ListToggle"] - path = .vim/bundle/ListToggle + path = .vim/pack/plugins/start/ListToggle url = https://github.com/Valloric/ListToggle.git [submodule ".vim/bundle/ale"] - path = .vim/bundle/ale + path = .vim/pack/plugins/start/ale url = https://github.com/dense-analysis/ale.git [submodule ".vim/bundle/rust.vim"] - path = .vim/bundle/rust.vim + path = .vim/pack/plugins/start/rust.vim url = https://github.com/rust-lang/rust.vim [submodule ".vim/bundle/vim-solarized8"] - path = .vim/bundle/vim-solarized8 + path = .vim/pack/plugins/start/vim-solarized8 url = https://github.com/lifepillar/vim-solarized8.git diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive deleted file mode 160000 index 1a77f1c..0000000 --- a/.vim/bundle/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1a77f1c00e12e8460f39098ec3289c5433d32512 diff --git a/.vim/bundle/ListToggle b/.vim/pack/plugins/start/ListToggle similarity index 100% rename from .vim/bundle/ListToggle rename to .vim/pack/plugins/start/ListToggle diff --git a/.vim/bundle/ale b/.vim/pack/plugins/start/ale similarity index 100% rename from .vim/bundle/ale rename to .vim/pack/plugins/start/ale diff --git a/.vim/bundle/deoplete.nvim b/.vim/pack/plugins/start/deoplete.nvim similarity index 100% rename from .vim/bundle/deoplete.nvim rename to .vim/pack/plugins/start/deoplete.nvim diff --git a/.vim/bundle/fzf b/.vim/pack/plugins/start/fzf similarity index 100% rename from .vim/bundle/fzf rename to .vim/pack/plugins/start/fzf diff --git a/.vim/bundle/fzf.vim b/.vim/pack/plugins/start/fzf.vim similarity index 100% rename from .vim/bundle/fzf.vim rename to .vim/pack/plugins/start/fzf.vim diff --git a/.vim/bundle/html5.vim b/.vim/pack/plugins/start/html5.vim similarity index 100% rename from .vim/bundle/html5.vim rename to .vim/pack/plugins/start/html5.vim diff --git a/.vim/bundle/nvim-yarp b/.vim/pack/plugins/start/nvim-yarp similarity index 100% rename from .vim/bundle/nvim-yarp rename to .vim/pack/plugins/start/nvim-yarp diff --git a/.vim/bundle/rust.vim b/.vim/pack/plugins/start/rust.vim similarity index 100% rename from .vim/bundle/rust.vim rename to .vim/pack/plugins/start/rust.vim diff --git a/.vim/bundle/tcomment_vim b/.vim/pack/plugins/start/tcomment_vim similarity index 100% rename from .vim/bundle/tcomment_vim rename to .vim/pack/plugins/start/tcomment_vim diff --git a/.vim/bundle/vim-abolish b/.vim/pack/plugins/start/vim-abolish similarity index 100% rename from .vim/bundle/vim-abolish rename to .vim/pack/plugins/start/vim-abolish diff --git a/.vim/bundle/vim-airline b/.vim/pack/plugins/start/vim-airline similarity index 100% rename from .vim/bundle/vim-airline rename to .vim/pack/plugins/start/vim-airline diff --git a/.vim/bundle/vim-airline-themes b/.vim/pack/plugins/start/vim-airline-themes similarity index 100% rename from .vim/bundle/vim-airline-themes rename to .vim/pack/plugins/start/vim-airline-themes diff --git a/.vim/bundle/vim-angry b/.vim/pack/plugins/start/vim-angry similarity index 100% rename from .vim/bundle/vim-angry rename to .vim/pack/plugins/start/vim-angry diff --git a/.vim/bundle/vim-argwrap b/.vim/pack/plugins/start/vim-argwrap similarity index 100% rename from .vim/bundle/vim-argwrap rename to .vim/pack/plugins/start/vim-argwrap diff --git a/.vim/bundle/vim-bbye b/.vim/pack/plugins/start/vim-bbye similarity index 100% rename from .vim/bundle/vim-bbye rename to .vim/pack/plugins/start/vim-bbye diff --git a/.vim/bundle/vim-better-whitespace b/.vim/pack/plugins/start/vim-better-whitespace similarity index 100% rename from .vim/bundle/vim-better-whitespace rename to .vim/pack/plugins/start/vim-better-whitespace diff --git a/.vim/bundle/vim-bufonly b/.vim/pack/plugins/start/vim-bufonly similarity index 100% rename from .vim/bundle/vim-bufonly rename to .vim/pack/plugins/start/vim-bufonly diff --git a/.vim/bundle/vim-dirvish b/.vim/pack/plugins/start/vim-dirvish similarity index 100% rename from .vim/bundle/vim-dirvish rename to .vim/pack/plugins/start/vim-dirvish diff --git a/.vim/bundle/vim-easy-align b/.vim/pack/plugins/start/vim-easy-align similarity index 100% rename from .vim/bundle/vim-easy-align rename to .vim/pack/plugins/start/vim-easy-align diff --git a/.vim/bundle/vim-eunuch b/.vim/pack/plugins/start/vim-eunuch similarity index 100% rename from .vim/bundle/vim-eunuch rename to .vim/pack/plugins/start/vim-eunuch diff --git a/.vim/bundle/vim-fswitch b/.vim/pack/plugins/start/vim-fswitch similarity index 100% rename from .vim/bundle/vim-fswitch rename to .vim/pack/plugins/start/vim-fswitch diff --git a/.vim/bundle/vim-go b/.vim/pack/plugins/start/vim-go similarity index 100% rename from .vim/bundle/vim-go rename to .vim/pack/plugins/start/vim-go diff --git a/.vim/bundle/vim-header b/.vim/pack/plugins/start/vim-header similarity index 100% rename from .vim/bundle/vim-header rename to .vim/pack/plugins/start/vim-header diff --git a/.vim/bundle/vim-hug-neovim-rpc b/.vim/pack/plugins/start/vim-hug-neovim-rpc similarity index 100% rename from .vim/bundle/vim-hug-neovim-rpc rename to .vim/pack/plugins/start/vim-hug-neovim-rpc diff --git a/.vim/bundle/vim-indent-guides b/.vim/pack/plugins/start/vim-indent-guides similarity index 100% rename from .vim/bundle/vim-indent-guides rename to .vim/pack/plugins/start/vim-indent-guides diff --git a/.vim/bundle/vim-indent-object b/.vim/pack/plugins/start/vim-indent-object similarity index 100% rename from .vim/bundle/vim-indent-object rename to .vim/pack/plugins/start/vim-indent-object diff --git a/.vim/bundle/vim-interestingwords b/.vim/pack/plugins/start/vim-interestingwords similarity index 100% rename from .vim/bundle/vim-interestingwords rename to .vim/pack/plugins/start/vim-interestingwords diff --git a/.vim/bundle/vim-javascript b/.vim/pack/plugins/start/vim-javascript similarity index 100% rename from .vim/bundle/vim-javascript rename to .vim/pack/plugins/start/vim-javascript diff --git a/.vim/bundle/vim-jdaddy b/.vim/pack/plugins/start/vim-jdaddy similarity index 100% rename from .vim/bundle/vim-jdaddy rename to .vim/pack/plugins/start/vim-jdaddy diff --git a/.vim/bundle/vim-markdown b/.vim/pack/plugins/start/vim-markdown similarity index 100% rename from .vim/bundle/vim-markdown rename to .vim/pack/plugins/start/vim-markdown diff --git a/.vim/bundle/vim-pathogen b/.vim/pack/plugins/start/vim-pathogen similarity index 100% rename from .vim/bundle/vim-pathogen rename to .vim/pack/plugins/start/vim-pathogen diff --git a/.vim/bundle/vim-repeat b/.vim/pack/plugins/start/vim-repeat similarity index 100% rename from .vim/bundle/vim-repeat rename to .vim/pack/plugins/start/vim-repeat diff --git a/.vim/bundle/vim-rooter b/.vim/pack/plugins/start/vim-rooter similarity index 100% rename from .vim/bundle/vim-rooter rename to .vim/pack/plugins/start/vim-rooter diff --git a/.vim/bundle/vim-signify b/.vim/pack/plugins/start/vim-signify similarity index 100% rename from .vim/bundle/vim-signify rename to .vim/pack/plugins/start/vim-signify diff --git a/.vim/bundle/vim-solarized8 b/.vim/pack/plugins/start/vim-solarized8 similarity index 100% rename from .vim/bundle/vim-solarized8 rename to .vim/pack/plugins/start/vim-solarized8 diff --git a/.vim/bundle/vim-sort-motion b/.vim/pack/plugins/start/vim-sort-motion similarity index 100% rename from .vim/bundle/vim-sort-motion rename to .vim/pack/plugins/start/vim-sort-motion diff --git a/.vim/bundle/vim-speeddating b/.vim/pack/plugins/start/vim-speeddating similarity index 100% rename from .vim/bundle/vim-speeddating rename to .vim/pack/plugins/start/vim-speeddating diff --git a/.vim/bundle/vim-surround b/.vim/pack/plugins/start/vim-surround similarity index 100% rename from .vim/bundle/vim-surround rename to .vim/pack/plugins/start/vim-surround diff --git a/.vim/bundle/vim-toml b/.vim/pack/plugins/start/vim-toml similarity index 100% rename from .vim/bundle/vim-toml rename to .vim/pack/plugins/start/vim-toml diff --git a/.vim/bundle/vim-unimpaired b/.vim/pack/plugins/start/vim-unimpaired similarity index 100% rename from .vim/bundle/vim-unimpaired rename to .vim/pack/plugins/start/vim-unimpaired diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 4b0552c..d8a1359 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -1,7 +1,3 @@ -" vim-pathogen -runtime bundle/vim-pathogen/autoload/pathogen.vim -execute pathogen#infect('bundle/{}') - " ale let g:ale_linters_explicit = 1 let g:ale_cpp_ccls_init_options = { @@ -15,7 +11,6 @@ if has('python3') if len($PYTHON3_HOST_PROG) > 0 let g:python3_host_prog=$PYTHON3_HOST_PROG endif - call deoplete#custom#option('sources', {'_': ['ale']}) endif " fzf