From 103c8022a63272feb74fccd1a1df87d507c0ea34 Mon Sep 17 00:00:00 2001 From: Thomas Lindner Date: Sat, 4 Sep 2021 16:01:24 +0200 Subject: [PATCH] remove pathogen, remove vim-fish, add rainbow --- .gitmodules | 19 ++++++++----------- bundle/editorconfig-vim | 1 - bundle/rust.vim | 1 - bundle/vim-bracketed-paste | 1 - bundle/vim-fish | 1 - bundle/vim-flake8 | 1 - bundle/vim-pathogen | 1 - bundle/vim-sensible | 1 - pack/default/start/editorconfig-vim | 1 + pack/default/start/rainbow | 1 + pack/default/start/rust.vim | 1 + pack/default/start/vim-bracketed-paste | 1 + pack/default/start/vim-flake8 | 1 + pack/default/start/vim-sensible | 1 + vimrc | 6 ++---- 15 files changed, 16 insertions(+), 22 deletions(-) delete mode 160000 bundle/editorconfig-vim delete mode 160000 bundle/rust.vim delete mode 160000 bundle/vim-bracketed-paste delete mode 160000 bundle/vim-fish delete mode 160000 bundle/vim-flake8 delete mode 160000 bundle/vim-pathogen delete mode 160000 bundle/vim-sensible create mode 160000 pack/default/start/editorconfig-vim create mode 160000 pack/default/start/rainbow create mode 160000 pack/default/start/rust.vim create mode 160000 pack/default/start/vim-bracketed-paste create mode 160000 pack/default/start/vim-flake8 create mode 160000 pack/default/start/vim-sensible diff --git a/.gitmodules b/.gitmodules index 1fe996f..9d3890e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,21 +1,18 @@ -[submodule "bundle/vim-pathogen"] - path = bundle/vim-pathogen - url = https://github.com/tpope/vim-pathogen.git [submodule "bundle/vim-sensible"] - path = bundle/vim-sensible + path = pack/default/start/vim-sensible url = https://github.com/tpope/vim-sensible.git [submodule "bundle/vim-bracketed-paste"] - path = bundle/vim-bracketed-paste + path = pack/default/start/vim-bracketed-paste url = https://github.com/ConradIrwin/vim-bracketed-paste.git -[submodule "bundle/vim-fish"] - path = bundle/vim-fish - url = https://github.com/dag/vim-fish [submodule "bundle/vim-flake8"] - path = bundle/vim-flake8 + path = pack/default/start/vim-flake8 url = https://github.com/nvie/vim-flake8 [submodule "bundle/rust.vim"] - path = bundle/rust.vim + path = pack/default/start/rust.vim url = https://github.com/rust-lang/rust.vim.git [submodule "bundle/editorconfig-vim"] - path = bundle/editorconfig-vim + path = pack/default/start/editorconfig-vim url = https://github.com/editorconfig/editorconfig-vim +[submodule "pack/default/start/rainbow"] + path = pack/default/start/rainbow + url = https://github.com/luochen1990/rainbow diff --git a/bundle/editorconfig-vim b/bundle/editorconfig-vim deleted file mode 160000 index e96ecb8..0000000 --- a/bundle/editorconfig-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e96ecb8f863d6d1564b876e799eb7bd75e8181bc diff --git a/bundle/rust.vim b/bundle/rust.vim deleted file mode 160000 index 2fa3e21..0000000 --- a/bundle/rust.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2fa3e213e713d981633ed7db4483296055a20bea diff --git a/bundle/vim-bracketed-paste b/bundle/vim-bracketed-paste deleted file mode 160000 index 36779ba..0000000 --- a/bundle/vim-bracketed-paste +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 36779ba3b1af4b81fcba7b83095afe794a07b71a diff --git a/bundle/vim-fish b/bundle/vim-fish deleted file mode 160000 index 825853f..0000000 --- a/bundle/vim-fish +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 825853f4816a07e59ea2ecee1190ab6a5d9ef991 diff --git a/bundle/vim-flake8 b/bundle/vim-flake8 deleted file mode 160000 index 21bc78d..0000000 --- a/bundle/vim-flake8 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 21bc78d9a3a17653dd5ea1f6a6c92445d23b215b diff --git a/bundle/vim-pathogen b/bundle/vim-pathogen deleted file mode 160000 index b4174e4..0000000 --- a/bundle/vim-pathogen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b4174e4d1a16e7f0c5c6dfca923269a20a9f50c2 diff --git a/bundle/vim-sensible b/bundle/vim-sensible deleted file mode 160000 index 26f8783..0000000 --- a/bundle/vim-sensible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 26f8783e08efef27fc01e0df6465b8f94c8bf270 diff --git a/pack/default/start/editorconfig-vim b/pack/default/start/editorconfig-vim new file mode 160000 index 0000000..3078cd1 --- /dev/null +++ b/pack/default/start/editorconfig-vim @@ -0,0 +1 @@ +Subproject commit 3078cd10b28904e57d878c0d0dab42aa0a9fdc89 diff --git a/pack/default/start/rainbow b/pack/default/start/rainbow new file mode 160000 index 0000000..4d15633 --- /dev/null +++ b/pack/default/start/rainbow @@ -0,0 +1 @@ +Subproject commit 4d15633cdaf61602e1d9fd216a77fc02e0881b2d diff --git a/pack/default/start/rust.vim b/pack/default/start/rust.vim new file mode 160000 index 0000000..7505d5b --- /dev/null +++ b/pack/default/start/rust.vim @@ -0,0 +1 @@ +Subproject commit 7505d5b7f66a163209a181dff327b57d592da7c2 diff --git a/pack/default/start/vim-bracketed-paste b/pack/default/start/vim-bracketed-paste new file mode 160000 index 0000000..c4c639f --- /dev/null +++ b/pack/default/start/vim-bracketed-paste @@ -0,0 +1 @@ +Subproject commit c4c639f3cacd1b874ed6f5f196fac772e089c932 diff --git a/pack/default/start/vim-flake8 b/pack/default/start/vim-flake8 new file mode 160000 index 0000000..ddceec6 --- /dev/null +++ b/pack/default/start/vim-flake8 @@ -0,0 +1 @@ +Subproject commit ddceec6c457fd59bc2a9321cbf817e42aa4bfd86 diff --git a/pack/default/start/vim-sensible b/pack/default/start/vim-sensible new file mode 160000 index 0000000..2d9f34c --- /dev/null +++ b/pack/default/start/vim-sensible @@ -0,0 +1 @@ +Subproject commit 2d9f34c09f548ed4df213389caa2882bfe56db58 diff --git a/vimrc b/vimrc index 067d97e..fe42f62 100644 --- a/vimrc +++ b/vimrc @@ -1,8 +1,6 @@ -set sts=4 sw=4 et +set sts=2 sw=2 et set guioptions-=m set guioptions-=T -runtime bundle/vim-pathogen/autoload/pathogen.vim -execute pathogen#infect() - +let g:rainbow_active = 1 "doesn't work? why? autocmd BufWritePost *.py call Flake8()