diff --git a/.gitmodules b/.gitmodules index f8e7279..766e280 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [submodule "vim/pack/plugins/opt/yats.vim"] path = vim/pack/plugins/opt/yats.vim url = https://github.com/HerringtonDarkholme/yats.vim -[submodule "vim/pack/plugins/start/coc.nvim"] - path = vim/pack/plugins/opt/coc.nvim - url = https://github.com/neoclide/coc.nvim diff --git a/gitconfig b/gitconfig index 38c3260..f757ce0 100644 --- a/gitconfig +++ b/gitconfig @@ -10,3 +10,5 @@ excludesfile = ~/.gitignore [fetch] prune = true +[pull] + rebase = true diff --git a/vim/ftplugin/typescript.vim b/vim/ftplugin/typescript.vim index 26df815..43977bd 100644 --- a/vim/ftplugin/typescript.vim +++ b/vim/ftplugin/typescript.vim @@ -1,2 +1 @@ packadd yats.vim -packadd coc.nvim diff --git a/vim/pack/plugins/opt/coc.nvim b/vim/pack/plugins/opt/coc.nvim deleted file mode 160000 index b5950ac..0000000 --- a/vim/pack/plugins/opt/coc.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5950acdbb4e6d36323085b10926b41eac245738 diff --git a/vim/pack/plugins/opt/vim-gitgutter b/vim/pack/plugins/opt/vim-gitgutter index ded1194..f19b620 160000 --- a/vim/pack/plugins/opt/vim-gitgutter +++ b/vim/pack/plugins/opt/vim-gitgutter @@ -1 +1 @@ -Subproject commit ded11946c04aeab5526f869174044019ae9e3c32 +Subproject commit f19b6203191d69de955d91467a5707959572119b diff --git a/vim/pack/plugins/opt/yats.vim b/vim/pack/plugins/opt/yats.vim index 68cd1da..4bf3879 160000 --- a/vim/pack/plugins/opt/yats.vim +++ b/vim/pack/plugins/opt/yats.vim @@ -1 +1 @@ -Subproject commit 68cd1da2bcea5fb3fbe6b6266958ae7c72e814da +Subproject commit 4bf3879055847e675335f1c3050bd2dd11700c7e diff --git a/vim/plugin/coc.vim b/vim/plugin/coc.vim deleted file mode 100644 index e61616d..0000000 --- a/vim/plugin/coc.vim +++ /dev/null @@ -1,3 +0,0 @@ -let g:coc_disable_startup_warning = 1 -let g:coc_data_home = "~/.dotfiles/vim/coc" -let g:coc_config_home = "~/.dotfiles/vim/nvim" diff --git a/zsh/plugins/pure b/zsh/plugins/pure index 3b2606d..47c0c88 160000 --- a/zsh/plugins/pure +++ b/zsh/plugins/pure @@ -1 +1 @@ -Subproject commit 3b2606db2e7eb6f05c67b229b5e3c68a1c3947a6 +Subproject commit 47c0c881f0e7cfdb5eaccd335f52ad17b897c060 diff --git a/zsh/plugins/zsh-syntax-highlighting b/zsh/plugins/zsh-syntax-highlighting index caa749d..122dc46 160000 --- a/zsh/plugins/zsh-syntax-highlighting +++ b/zsh/plugins/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit caa749d030d22168445c4cb97befd406d2828db0 +Subproject commit 122dc464392302114556b53ec01a1390c54f739f