From eecc929bddf7ebe8c9150b2773ff0d330d8172b5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 6 Jul 2019 14:19:09 +0200 Subject: [PATCH] [vim] replace wuman-vimrc with own config --- .gitmodules | 49 ++++++++++++++++++++++++++++++++++---- install.conf.json | 7 +++--- vim/start/YouCompleteMe | 1 + vim/start/ale | 1 + vim/start/auto-pairs | 1 + vim/start/editorconfig-vim | 1 + vim/start/gruvbox | 1 + vim/start/nerdcommenter | 1 + vim/start/nerdtree | 1 + vim/start/tabular | 1 + vim/start/vim-airline | 1 + vim/start/vim-eunuch | 1 + vim/start/vim-fugitive | 1 + vim/start/vim-json | 1 + vim/start/vim-signify | 1 + vim/start/vim-surround | 1 + vim/wuman-vimrc | 1 - 17 files changed, 63 insertions(+), 8 deletions(-) create mode 160000 vim/start/YouCompleteMe create mode 160000 vim/start/ale create mode 160000 vim/start/auto-pairs create mode 160000 vim/start/editorconfig-vim create mode 160000 vim/start/gruvbox create mode 160000 vim/start/nerdcommenter create mode 160000 vim/start/nerdtree create mode 160000 vim/start/tabular create mode 160000 vim/start/vim-airline create mode 160000 vim/start/vim-eunuch create mode 160000 vim/start/vim-fugitive create mode 160000 vim/start/vim-json create mode 160000 vim/start/vim-signify create mode 160000 vim/start/vim-surround delete mode 160000 vim/wuman-vimrc diff --git a/.gitmodules b/.gitmodules index 4833330..8d28ab3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,6 @@ [submodule "dotbot"] path = dotbot url = https://github.com/anishathalye/dotbot -[submodule "vim/wuman-vimrc"] - path = vim/wuman-vimrc - url = https://github.com/wuman/vimrc - ignore = dirty [submodule "git/diff-so-fancy"] path = git/diff-so-fancy url = https://github.com/so-fancy/diff-so-fancy @@ -14,3 +10,48 @@ [submodule "cron/blackcheck"] path = cron/blackcheck url = https://github.com/Stunkymonkey/blackcheck.git +[submodule "vim/bundle/fzf.vim"] + path = vim/bundle/fzf.vim + url = https://github.com/junegunn/fzf.vim +[submodule "vim/start/editorconfig-vim"] + path = vim/start/editorconfig-vim + url = https://github.com/editorconfig/editorconfig-vim +[submodule "vim/start/vim-eunuch"] + path = vim/start/vim-eunuch + url = https://github.com/tpope/vim-eunuch.git +[submodule "vim/start/auto-pairs"] + path = vim/start/auto-pairs + url = https://github.com/jiangmiao/auto-pairs.git +[submodule "vim/start/vim-json"] + path = vim/start/vim-json + url = https://github.com/elzr/vim-json.git +[submodule "vim/start/nerdcommenter"] + path = vim/start/nerdcommenter + url = https://github.com/scrooloose/nerdcommenter.git +[submodule "vim/start/YouCompleteMe"] + path = vim/start/YouCompleteMe + url = https://github.com/ycm-core/YouCompleteMe.git +[submodule "vim/start/vim-surround"] + path = vim/start/vim-surround + url = https://github.com/tpope/vim-surround.git +[submodule "vim/start/vim-signify"] + path = vim/start/vim-signify + url = https://github.com/mhinz/vim-signify.git +[submodule "vim/start/vim-airline"] + path = vim/start/vim-airline + url = https://github.com/vim-airline/vim-airline.git +[submodule "vim/start/gruvbox"] + path = vim/start/gruvbox + url = https://github.com/morhetz/gruvbox.git +[submodule "vim/start/vim-fugitive"] + path = vim/start/vim-fugitive + url = https://github.com/tpope/vim-fugitive.git +[submodule "vim/start/tabular"] + path = vim/start/tabular + url = https://github.com/godlygeek/tabular.git +[submodule "vim/start/ale"] + path = vim/start/ale + url = https://github.com/w0rp/ale.git +[submodule "vim/start/nerdtree"] + path = vim/start/nerdtree + url = https://github.com/scrooloose/nerdtree.git diff --git a/install.conf.json b/install.conf.json index 638dbee..c415ef2 100644 --- a/install.conf.json +++ b/install.conf.json @@ -22,7 +22,7 @@ ["mkdir -p ~/.config/rofi", "Creating rofi dir"], ["mkdir -p ~/.config/sway", "Creating sway dir"], ["mkdir -p ~/.config/yay", "Creating yay dir"], - ["mkdir -p ~/.vim/", "Creating vim dir"] + ["mkdir -p ~/.vim/pack/dotfiles/", "Creating vim dir"] ] }, { @@ -66,8 +66,9 @@ "~/.tmux.conf": "tmux/tmux.conf", "~/.toprc": "top/toprc", "~/.config/htop/htoprc": "top/htoprc", - "~/.vimrc": "vim/wuman-vimrc/vimrc", - "~/.vim/bundle": "vim/wuman-vimrc/bundle", + "~/.vimrc": "vim/vimrc", + "~/.vim/pack/dotfiles/start": "vim/start", + "~/.vim/pack/dotfiles/opt": "vim/opt", "~/.wgetrc": "wget/wgetrc", "~/.Xresources": "i3/Xresources", "~/.config/yay/config.json": "yay/config.json" diff --git a/vim/start/YouCompleteMe b/vim/start/YouCompleteMe new file mode 160000 index 0000000..d556a43 --- /dev/null +++ b/vim/start/YouCompleteMe @@ -0,0 +1 @@ +Subproject commit d556a43c1af6a4e4075e875934e250f589df0dee diff --git a/vim/start/ale b/vim/start/ale new file mode 160000 index 0000000..a524000 --- /dev/null +++ b/vim/start/ale @@ -0,0 +1 @@ +Subproject commit a5240009ba5ff22daad95c306f7dec372d46bda0 diff --git a/vim/start/auto-pairs b/vim/start/auto-pairs new file mode 160000 index 0000000..39f06b8 --- /dev/null +++ b/vim/start/auto-pairs @@ -0,0 +1 @@ +Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76 diff --git a/vim/start/editorconfig-vim b/vim/start/editorconfig-vim new file mode 160000 index 0000000..37bedf8 --- /dev/null +++ b/vim/start/editorconfig-vim @@ -0,0 +1 @@ +Subproject commit 37bedf88cabb61d4580295b6e347058df7e7f1b4 diff --git a/vim/start/gruvbox b/vim/start/gruvbox new file mode 160000 index 0000000..cb4e7a5 --- /dev/null +++ b/vim/start/gruvbox @@ -0,0 +1 @@ +Subproject commit cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86 diff --git a/vim/start/nerdcommenter b/vim/start/nerdcommenter new file mode 160000 index 0000000..7f5c217 --- /dev/null +++ b/vim/start/nerdcommenter @@ -0,0 +1 @@ +Subproject commit 7f5c217f79b8fce063fec490ab0b2814dd480f08 diff --git a/vim/start/nerdtree b/vim/start/nerdtree new file mode 160000 index 0000000..89a1a43 --- /dev/null +++ b/vim/start/nerdtree @@ -0,0 +1 @@ +Subproject commit 89a1a4355bd9572d0f5b3d23733c243c6e7b05c2 diff --git a/vim/start/tabular b/vim/start/tabular new file mode 160000 index 0000000..339091a --- /dev/null +++ b/vim/start/tabular @@ -0,0 +1 @@ +Subproject commit 339091ac4dd1f17e225fe7d57b48aff55f99b23a diff --git a/vim/start/vim-airline b/vim/start/vim-airline new file mode 160000 index 0000000..2db9b27 --- /dev/null +++ b/vim/start/vim-airline @@ -0,0 +1 @@ +Subproject commit 2db9b27e39bfd84cb432e001b4a3f41f633b3b7e diff --git a/vim/start/vim-eunuch b/vim/start/vim-eunuch new file mode 160000 index 0000000..e066a09 --- /dev/null +++ b/vim/start/vim-eunuch @@ -0,0 +1 @@ +Subproject commit e066a0999e442d9d96f24ad9d203b1bd030ef72e diff --git a/vim/start/vim-fugitive b/vim/start/vim-fugitive new file mode 160000 index 0000000..137433c --- /dev/null +++ b/vim/start/vim-fugitive @@ -0,0 +1 @@ +Subproject commit 137433c3c058e0a70f45697ad515e3a881877f95 diff --git a/vim/start/vim-json b/vim/start/vim-json new file mode 160000 index 0000000..3727f08 --- /dev/null +++ b/vim/start/vim-json @@ -0,0 +1 @@ +Subproject commit 3727f089410e23ae113be6222e8a08dd2613ecf2 diff --git a/vim/start/vim-signify b/vim/start/vim-signify new file mode 160000 index 0000000..ac23bd9 --- /dev/null +++ b/vim/start/vim-signify @@ -0,0 +1 @@ +Subproject commit ac23bd95d5fe0c7a7bf4a331e9d37eb72697c46e diff --git a/vim/start/vim-surround b/vim/start/vim-surround new file mode 160000 index 0000000..ca58a2d --- /dev/null +++ b/vim/start/vim-surround @@ -0,0 +1 @@ +Subproject commit ca58a2d886cc18734c90c9665da4775d444b0c04 diff --git a/vim/wuman-vimrc b/vim/wuman-vimrc deleted file mode 160000 index c945998..0000000 --- a/vim/wuman-vimrc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c9459987b451bf46cce076b787225088b3e6e6ac