From 9df7fbc0ba6b0c6e73ff1b2ac53d9386e1d67f5a Mon Sep 17 00:00:00 2001 From: Salt Date: Tue, 19 Jan 2021 02:29:22 -0600 Subject: [PATCH] Move Vim configuration into base --- .gitmodules | 24 +++++++++---------- README.md | 1 - {vim => base}/.vim/autoload/pathogen.vim | 0 {vim => base}/.vim/bundle/SimpylFold | 0 {vim => base}/.vim/bundle/ale | 0 {vim => base}/.vim/bundle/gruvbox | 0 {vim => base}/.vim/bundle/incsearch.vim | 0 .../.vim/bundle/lightline-gruvbox.vim | 0 {vim => base}/.vim/bundle/lightline.vim | 0 {vim => base}/.vim/bundle/vim-ansible-yaml | 0 {vim => base}/.vim/bundle/vim-closetag | 0 {vim => base}/.vim/bundle/vim-css-color | 0 {vim => base}/.vim/bundle/vim-javascript | 0 {vim => base}/.vim/bundle/vim-template | 0 {vim => base}/.vim/pathogen | 0 {vim => base}/.vim/templates/=template=.bash | 0 {vim => base}/.vim/templates/=template=.py | 0 {vim => base}/.vimrc | 0 18 files changed, 12 insertions(+), 13 deletions(-) rename {vim => base}/.vim/autoload/pathogen.vim (100%) rename {vim => base}/.vim/bundle/SimpylFold (100%) rename {vim => base}/.vim/bundle/ale (100%) rename {vim => base}/.vim/bundle/gruvbox (100%) rename {vim => base}/.vim/bundle/incsearch.vim (100%) rename {vim => base}/.vim/bundle/lightline-gruvbox.vim (100%) rename {vim => base}/.vim/bundle/lightline.vim (100%) rename {vim => base}/.vim/bundle/vim-ansible-yaml (100%) rename {vim => base}/.vim/bundle/vim-closetag (100%) rename {vim => base}/.vim/bundle/vim-css-color (100%) rename {vim => base}/.vim/bundle/vim-javascript (100%) rename {vim => base}/.vim/bundle/vim-template (100%) rename {vim => base}/.vim/pathogen (100%) rename {vim => base}/.vim/templates/=template=.bash (100%) rename {vim => base}/.vim/templates/=template=.py (100%) rename {vim => base}/.vimrc (100%) diff --git a/.gitmodules b/.gitmodules index 6e5505a5..d9416ca2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,38 +1,38 @@ [submodule "vim/.vim/pathogen"] - path = vim/.vim/pathogen + path = base/.vim/pathogen url = https://github.com/tpope/vim-pathogen [submodule "vim/.vim/bundle/vim-closetag"] - path = vim/.vim/bundle/vim-closetag + path = base/.vim/bundle/vim-closetag url = https://github.com/alvan/vim-closetag.git [submodule "vim/.vim/bundle/gruvbox"] - path = vim/.vim/bundle/gruvbox + path = base/.vim/bundle/gruvbox url = https://github.com/morhetz/gruvbox [submodule "vim/.vim/bundle/SimpylFold"] - path = vim/.vim/bundle/SimpylFold + path = base/.vim/bundle/SimpylFold url = https://github.com/tmhedberg/SimpylFold.git [submodule "vim/.vim/bundle/vim-template"] - path = vim/.vim/bundle/vim-template + path = base/.vim/bundle/vim-template url = https://github.com/aperezdc/vim-template.git [submodule "vim/.vim/bundle/incsearch.vim"] - path = vim/.vim/bundle/incsearch.vim + path = base/.vim/bundle/incsearch.vim url = https://github.com/haya14busa/incsearch.vim.git [submodule "vim/.vim/bundle/lightline.vim"] - path = vim/.vim/bundle/lightline.vim + path = base/.vim/bundle/lightline.vim url = https://github.com/itchyny/lightline.vim [submodule "vim/.vim/bundle/ale"] - path = vim/.vim/bundle/ale + path = base/.vim/bundle/ale url = https://github.com/w0rp/ale [submodule "vim/.vim/bundle/lightline-gruvbox.vim"] - path = vim/.vim/bundle/lightline-gruvbox.vim + path = base/.vim/bundle/lightline-gruvbox.vim url = https://github.com/shinchu/lightline-gruvbox.vim [submodule "vim/.vim/bundle/vim-css-color"] - path = vim/.vim/bundle/vim-css-color + path = base/.vim/bundle/vim-css-color url = https://github.com/ap/vim-css-color [submodule "vim/.vim/bundle/vim-javascript"] - path = vim/.vim/bundle/vim-javascript + path = base/.vim/bundle/vim-javascript url = https://github.com/pangloss/vim-javascript [submodule "vim/.vim/bundle/vim-ansible-yaml"] - path = vim/.vim/bundle/vim-ansible-yaml + path = base/.vim/bundle/vim-ansible-yaml url = https://github.com/chase/vim-ansible-yaml [submodule "firestarter/.firestarter"] path = firestarter/.firestarter diff --git a/README.md b/README.md index c79b9d08..6c45281d 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ This stash contains a number of packages for numerous situations: | `git` | My personal git configuration. Separated from base because sometimes I don't want cockmail on all my commits. | | `mac` | MacOS-specific configs. Very sparse; I hardly ever have to use one. | | `ssh` | SSH configuration for my desktop machines. | -| `vim` | Configuration for Vim, everybody\*'s favorite text editor. Contains a fair few plugins and a mildly flabby `.vimrc`. | Included within are also a handful of management scripts. diff --git a/vim/.vim/autoload/pathogen.vim b/base/.vim/autoload/pathogen.vim similarity index 100% rename from vim/.vim/autoload/pathogen.vim rename to base/.vim/autoload/pathogen.vim diff --git a/vim/.vim/bundle/SimpylFold b/base/.vim/bundle/SimpylFold similarity index 100% rename from vim/.vim/bundle/SimpylFold rename to base/.vim/bundle/SimpylFold diff --git a/vim/.vim/bundle/ale b/base/.vim/bundle/ale similarity index 100% rename from vim/.vim/bundle/ale rename to base/.vim/bundle/ale diff --git a/vim/.vim/bundle/gruvbox b/base/.vim/bundle/gruvbox similarity index 100% rename from vim/.vim/bundle/gruvbox rename to base/.vim/bundle/gruvbox diff --git a/vim/.vim/bundle/incsearch.vim b/base/.vim/bundle/incsearch.vim similarity index 100% rename from vim/.vim/bundle/incsearch.vim rename to base/.vim/bundle/incsearch.vim diff --git a/vim/.vim/bundle/lightline-gruvbox.vim b/base/.vim/bundle/lightline-gruvbox.vim similarity index 100% rename from vim/.vim/bundle/lightline-gruvbox.vim rename to base/.vim/bundle/lightline-gruvbox.vim diff --git a/vim/.vim/bundle/lightline.vim b/base/.vim/bundle/lightline.vim similarity index 100% rename from vim/.vim/bundle/lightline.vim rename to base/.vim/bundle/lightline.vim diff --git a/vim/.vim/bundle/vim-ansible-yaml b/base/.vim/bundle/vim-ansible-yaml similarity index 100% rename from vim/.vim/bundle/vim-ansible-yaml rename to base/.vim/bundle/vim-ansible-yaml diff --git a/vim/.vim/bundle/vim-closetag b/base/.vim/bundle/vim-closetag similarity index 100% rename from vim/.vim/bundle/vim-closetag rename to base/.vim/bundle/vim-closetag diff --git a/vim/.vim/bundle/vim-css-color b/base/.vim/bundle/vim-css-color similarity index 100% rename from vim/.vim/bundle/vim-css-color rename to base/.vim/bundle/vim-css-color diff --git a/vim/.vim/bundle/vim-javascript b/base/.vim/bundle/vim-javascript similarity index 100% rename from vim/.vim/bundle/vim-javascript rename to base/.vim/bundle/vim-javascript diff --git a/vim/.vim/bundle/vim-template b/base/.vim/bundle/vim-template similarity index 100% rename from vim/.vim/bundle/vim-template rename to base/.vim/bundle/vim-template diff --git a/vim/.vim/pathogen b/base/.vim/pathogen similarity index 100% rename from vim/.vim/pathogen rename to base/.vim/pathogen diff --git a/vim/.vim/templates/=template=.bash b/base/.vim/templates/=template=.bash similarity index 100% rename from vim/.vim/templates/=template=.bash rename to base/.vim/templates/=template=.bash diff --git a/vim/.vim/templates/=template=.py b/base/.vim/templates/=template=.py similarity index 100% rename from vim/.vim/templates/=template=.py rename to base/.vim/templates/=template=.py diff --git a/vim/.vimrc b/base/.vimrc similarity index 100% rename from vim/.vimrc rename to base/.vimrc