From 914e8a19921b1f9e683c724c36405d1b8ec899f5 Mon Sep 17 00:00:00 2001 From: druckdev Date: Tue, 22 Dec 2020 16:22:33 +0100 Subject: [PATCH] repo: Update submodules & cleanup gitmodules Update all submodules to the newest commit. Change submodule names in `.gitmodules` from local path to repo names. Sort and group `.gitmodules` by program that uses it. Remove the clone of 'fzf-tab' as my pull request got merged. --- .config/tmux/plugins/tmux-continuum | 2 +- .config/vim/pack/plugins/opt/coc.nvim | 2 +- .config/vim/pack/plugins/opt/delimitMate | 2 +- .config/vim/pack/plugins/opt/fzf.vim | 2 +- .config/vim/pack/plugins/opt/onedark.vim | 2 +- .config/vim/pack/plugins/opt/vim-gitgutter | 2 +- .config/vim/pack/plugins/opt/vimtex | 2 +- .config/zsh/plugins/fzf-tab | 2 +- .config/zsh/plugins/fzf-tab-fork | 1 - .config/zsh/plugins/powerlevel10k | 2 +- .../zshrc.d/90-external-plugins/40-fzf-tab | 2 +- .gitmodules | 122 +++++++++--------- .local/bin/fzf-repo | 2 +- meta/dotbot | 2 +- 14 files changed, 74 insertions(+), 73 deletions(-) delete mode 160000 .config/zsh/plugins/fzf-tab-fork diff --git a/.config/tmux/plugins/tmux-continuum b/.config/tmux/plugins/tmux-continuum index 26eb5ff..113826b 160000 --- a/.config/tmux/plugins/tmux-continuum +++ b/.config/tmux/plugins/tmux-continuum @@ -1 +1 @@ -Subproject commit 26eb5ffce0b559d682b9f98c8d4b6c370ecb639b +Subproject commit 113826b161c1b1e54d2b5b3f26bd2fc8fc46ed92 diff --git a/.config/vim/pack/plugins/opt/coc.nvim b/.config/vim/pack/plugins/opt/coc.nvim index 3e5fbe3..e8257be 160000 --- a/.config/vim/pack/plugins/opt/coc.nvim +++ b/.config/vim/pack/plugins/opt/coc.nvim @@ -1 +1 @@ -Subproject commit 3e5fbe3a93566730d5927618074dcb85635d89f3 +Subproject commit e8257bea7c5ed9e6fb344d1ee48011510d423d6f diff --git a/.config/vim/pack/plugins/opt/delimitMate b/.config/vim/pack/plugins/opt/delimitMate index 16687ae..537a1da 160000 --- a/.config/vim/pack/plugins/opt/delimitMate +++ b/.config/vim/pack/plugins/opt/delimitMate @@ -1 +1 @@ -Subproject commit 16687aec24d803bc76cae2d7bfe2b73b1cdda4ef +Subproject commit 537a1da0fa5eeb88640425c37e545af933c56e1b diff --git a/.config/vim/pack/plugins/opt/fzf.vim b/.config/vim/pack/plugins/opt/fzf.vim index 61c4b6d..e9d62b4 160000 --- a/.config/vim/pack/plugins/opt/fzf.vim +++ b/.config/vim/pack/plugins/opt/fzf.vim @@ -1 +1 @@ -Subproject commit 61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93 +Subproject commit e9d62b4c873f5f207202b4ba5bbd63de7003a0d3 diff --git a/.config/vim/pack/plugins/opt/onedark.vim b/.config/vim/pack/plugins/opt/onedark.vim index 7f9b180..94ff495 160000 --- a/.config/vim/pack/plugins/opt/onedark.vim +++ b/.config/vim/pack/plugins/opt/onedark.vim @@ -1 +1 @@ -Subproject commit 7f9b1802b0d76f4f8fe7ad5bbef472c96e1c104f +Subproject commit 94ff495eac89cea2532d8e0022f67c79a24d9649 diff --git a/.config/vim/pack/plugins/opt/vim-gitgutter b/.config/vim/pack/plugins/opt/vim-gitgutter index 696a6ed..512e299 160000 --- a/.config/vim/pack/plugins/opt/vim-gitgutter +++ b/.config/vim/pack/plugins/opt/vim-gitgutter @@ -1 +1 @@ -Subproject commit 696a6ed389e5b54c8bf480f44ee4e8fc59e6f903 +Subproject commit 512e2999ed7ff367580e0d6bc4d2daa81663221f diff --git a/.config/vim/pack/plugins/opt/vimtex b/.config/vim/pack/plugins/opt/vimtex index 7c886a0..6aa3c4b 160000 --- a/.config/vim/pack/plugins/opt/vimtex +++ b/.config/vim/pack/plugins/opt/vimtex @@ -1 +1 @@ -Subproject commit 7c886a0731f1aa283899575615b75192ec3632b7 +Subproject commit 6aa3c4b16cb0b72c8dcc89c8fbb33336c27fbe03 diff --git a/.config/zsh/plugins/fzf-tab b/.config/zsh/plugins/fzf-tab index 915f016..8584ed5 160000 --- a/.config/zsh/plugins/fzf-tab +++ b/.config/zsh/plugins/fzf-tab @@ -1 +1 @@ -Subproject commit 915f016eac0de87d495a94a8b9520dcc05b18549 +Subproject commit 8584ed59107f37996b977a499ea0d536d851920d diff --git a/.config/zsh/plugins/fzf-tab-fork b/.config/zsh/plugins/fzf-tab-fork deleted file mode 160000 index 239732e..0000000 --- a/.config/zsh/plugins/fzf-tab-fork +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 239732e6d49a7dce8f3ab529f91596ac85e5a066 diff --git a/.config/zsh/plugins/powerlevel10k b/.config/zsh/plugins/powerlevel10k index 2fc7257..5ea5d4b 160000 --- a/.config/zsh/plugins/powerlevel10k +++ b/.config/zsh/plugins/powerlevel10k @@ -1 +1 @@ -Subproject commit 2fc725748643a00baad6c0ef3645d71ddbb3c1f0 +Subproject commit 5ea5d4bc196d3b3c82d611149a541061e47716d5 diff --git a/.config/zsh/zshrc.d/90-external-plugins/40-fzf-tab b/.config/zsh/zshrc.d/90-external-plugins/40-fzf-tab index 5119779..237aa36 120000 --- a/.config/zsh/zshrc.d/90-external-plugins/40-fzf-tab +++ b/.config/zsh/zshrc.d/90-external-plugins/40-fzf-tab @@ -1 +1 @@ -../../plugins/fzf-tab-fork/fzf-tab.zsh \ No newline at end of file +../../plugins/fzf-tab/fzf-tab.plugin.zsh \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 1ba60f3..0f3ab31 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,69 +1,71 @@ [submodule "dotbot"] path = meta/dotbot url = https://github.com/anishathalye/dotbot -[submodule ".config/git/diff-so-fancy"] - path = .config/git/diff-so-fancy - url = https://github.com/so-fancy/diff-so-fancy -[submodule ".config/tmux/plugins/tmux-continuum"] - path = .config/tmux/plugins/tmux-continuum - url = https://github.com/tmux-plugins/tmux-continuum -[submodule ".config/tmux/plugins/tmux-prefix-highlight"] - path = .config/tmux/plugins/tmux-prefix-highlight - url = https://github.com/tmux-plugins/tmux-prefix-highlight -[submodule ".config/tmux/plugins/tmux-resurrect"] - path = .config/tmux/plugins/tmux-resurrect - url = https://github.com/tmux-plugins/tmux-resurrect -[submodule ".config/tmux/plugins/tmux-sensible"] - path = .config/tmux/plugins/tmux-sensible - url = https://github.com/tmux-plugins/tmux-sensible -[submodule ".config/tmux/plugins/tpm"] - path = .config/tmux/plugins/tpm - url = https://github.com/tmux-plugins/tpm -[submodule ".config/vim/pack/plugins/opt/coc.nvim"] - path = .config/vim/pack/plugins/opt/coc.nvim - url = https://github.com/neoclide/coc.nvim.git -[submodule ".config/vim/pack/plugins/opt/delimitMate"] - path = .config/vim/pack/plugins/opt/delimitMate - url = https://github.com/Raimondi/delimitMate.git -[submodule ".config/vim/pack/plugins/opt/fzf.vim"] - path = .config/vim/pack/plugins/opt/fzf.vim - url = https://github.com/junegunn/fzf.vim -[submodule ".config/vim/pack/plugins/opt/onedark.vim"] - path = .config/vim/pack/plugins/opt/onedark.vim - url = https://github.com/joshdick/onedark.vim -[submodule ".config/vim/pack/plugins/opt/vim-gitgutter"] - path = .config/vim/pack/plugins/opt/vim-gitgutter - url = https://github.com/airblade/vim-gitgutter -[submodule ".config/vim/pack/plugins/opt/vim-surround"] - path = .config/vim/pack/plugins/opt/vim-surround - url = https://github.com/tpope/vim-surround -[submodule ".config/zsh/plugins/fzf-tab"] - path = .config/zsh/plugins/fzf-tab - url = https://github.com/Aloxaf/fzf-tab -[submodule ".config/zsh/plugins/fzf-tab-fork"] - path = .config/zsh/plugins/fzf-tab-fork - url = git@github.com:druckdev/fzf-tab.git -[submodule ".config/zsh/plugins/powerlevel10k"] - path = .config/zsh/plugins/powerlevel10k - url = https://github.com/romkatv/powerlevel10k.git -[submodule ".config/zsh/plugins/stderred"] - path = .config/zsh/plugins/stderred - url = https://github.com/sickill/stderred -[submodule ".config/zsh/plugins/zsh-autosuggestions"] - path = .config/zsh/plugins/zsh-autosuggestions - url = https://github.com/zsh-users/zsh-autosuggestions -[submodule ".config/zsh/plugins/zsh-syntax-highlighting"] - path = .config/zsh/plugins/zsh-syntax-highlighting - url = https://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule ".local/bin/fzf-repo"] + +[submodule "fzf"] path = .local/bin/fzf-repo url = https://github.com/junegunn/fzf -[submodule ".config/vim/pack/plugins/opt/vimtex"] - path = .config/vim/pack/plugins/opt/vimtex - url = https://github.com/lervag/vimtex -[submodule ".config/vim/pack/plugins/opt/arm-syntax-vim"] + +[submodule "diff-so-fancy"] + path = .config/git/diff-so-fancy + url = https://github.com/so-fancy/diff-so-fancy + +[submodule "tmux-continuum"] + path = .config/tmux/plugins/tmux-continuum + url = https://github.com/tmux-plugins/tmux-continuum +[submodule "tmux-prefix-highlight"] + path = .config/tmux/plugins/tmux-prefix-highlight + url = https://github.com/tmux-plugins/tmux-prefix-highlight +[submodule "tmux-resurrect"] + path = .config/tmux/plugins/tmux-resurrect + url = https://github.com/tmux-plugins/tmux-resurrect +[submodule "tmux-sensible"] + path = .config/tmux/plugins/tmux-sensible + url = https://github.com/tmux-plugins/tmux-sensible +[submodule "tpm"] + path = .config/tmux/plugins/tpm + url = https://github.com/tmux-plugins/tpm + +[submodule "arm-syntax-vim"] path = .config/vim/pack/plugins/opt/arm-syntax-vim url = https://github.com/ARM9/arm-syntax-vim -[submodule ".config/vim/pack/plugins/opt/vim-gutentags"] +[submodule "coc.nvim"] + path = .config/vim/pack/plugins/opt/coc.nvim + url = https://github.com/neoclide/coc.nvim +[submodule "delimitMate"] + path = .config/vim/pack/plugins/opt/delimitMate + url = https://github.com/Raimondi/delimitMate +[submodule "fzf.vim"] + path = .config/vim/pack/plugins/opt/fzf.vim + url = https://github.com/junegunn/fzf.vim +[submodule "onedark.vim"] + path = .config/vim/pack/plugins/opt/onedark.vim + url = https://github.com/joshdick/onedark.vim +[submodule "vimtex"] + path = .config/vim/pack/plugins/opt/vimtex + url = https://github.com/lervag/vimtex +[submodule "vim-gitgutter"] + path = .config/vim/pack/plugins/opt/vim-gitgutter + url = https://github.com/airblade/vim-gitgutter +[submodule "vim-gutentags"] path = .config/vim/pack/plugins/opt/vim-gutentags url = https://github.com/ludovicchabant/vim-gutentags +[submodule "vim-surround"] + path = .config/vim/pack/plugins/opt/vim-surround + url = https://github.com/tpope/vim-surround + +[submodule "fzf-tab"] + path = .config/zsh/plugins/fzf-tab + url = https://github.com/Aloxaf/fzf-tab +[submodule "powerlevel10k"] + path = .config/zsh/plugins/powerlevel10k + url = https://github.com/romkatv/powerlevel10k +[submodule "stderred"] + path = .config/zsh/plugins/stderred + url = https://github.com/sickill/stderred +[submodule "zsh-autosuggestions"] + path = .config/zsh/plugins/zsh-autosuggestions + url = https://github.com/zsh-users/zsh-autosuggestions +[submodule "zsh-syntax-highlighting"] + path = .config/zsh/plugins/zsh-syntax-highlighting + url = https://github.com/zsh-users/zsh-syntax-highlighting diff --git a/.local/bin/fzf-repo b/.local/bin/fzf-repo index d099941..ab3937e 160000 --- a/.local/bin/fzf-repo +++ b/.local/bin/fzf-repo @@ -1 +1 @@ -Subproject commit d099941360e061587bf7d42cd029c91650ef5a44 +Subproject commit ab3937ee5a62d63bac9307bfe72601eeb4fc9cd2 diff --git a/meta/dotbot b/meta/dotbot index 5294594..d762955 160000 --- a/meta/dotbot +++ b/meta/dotbot @@ -1 +1 @@ -Subproject commit 5294594f5aa9c3affd0d656ba6843c1c0b0bce60 +Subproject commit d7629553bdc6a33cad3e3fb7a6201a9b2bcc7e3b