Reorganize directory structure to work with recent vim versions

This reorgnization allows for one to clone the repository directly to `~/.vim` without needing any extra symlinks from `.vim_dotfiles` or other location into one's home directory. All that's needed from then is to run `vim +PlugInstall +PlugClean! +qall` and you have a fully functioning vim setup, self contained in `~/.vim`. The `activate.sh` script left for consistency's sake and to not break people's workflows. It may also want to warn about legacy symlinks.
amacy · Sep 12, 2018 · 065a1b3 · 065a1b3
1 parent 0e17a9c
commit 065a1b3
Show file tree

Hide file tree

Showing 37 changed files with 25 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,20 @@
 ## Overview
 
-After cloning this project, you can run the following to link these dotfiles
-into your home directory:
+Clone this project directy into `~/.vim`:
 
-    ./activate.sh
+```bash
+# Clean up old unnecessary files or symlinks
+rm -f ~/.vimrc ~/.gvimrc ~/.vimrc.bundles ~/.vim
 
-Be warned: this will overwrite any existing .vimrc or .vim/ files you have in
-your home directory.
+# Clone directly into ~/.vim
+git clone [email protected]:braintreeps/vim_dotfiles ~/.vim
+```
+
+After cloning this project, you can run the following to update the plugins:
+
+```bash
+./activate.sh
+```
 
 Uses `vim-plug` to manage bundles.
 

diff --git a/activate.sh b/activate.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 
-set -e
+set -euo pipefail
 
 dotfiles_dir=$(cd "$(dirname "$0")"; pwd)
 
-for name in vim vimrc vimrc.bundles; do
-  rm -rf "${HOME}/.${name}"
-  ln -s "${dotfiles_dir}/${name}" "${HOME}/.${name}"
-done
+if ! vim --version | grep -q '2nd user vimrc file'; then
+  for name in vim vimrc vimrc.bundles; do
+    rm -rf "${HOME}/.${name}"
+    ln -s "${dotfiles_dir}/${name}" "${HOME}/.${name}"
+  done
+fi
 
 vim +PlugInstall +PlugClean! +qall
diff --git a/vim/after/plugin/netrw_list_hide.vim → after/plugin/netrw_list_hide.vim b/vim/after/plugin/netrw_list_hide.vim → after/plugin/netrw_list_hide.vim
diff --git a/vim/autoload/plug.vim → autoload/plug.vim b/vim/autoload/plug.vim → autoload/plug.vim
diff --git a/vim/colors/Tomorrow-Night.vim → colors/Tomorrow-Night.vim b/vim/colors/Tomorrow-Night.vim → colors/Tomorrow-Night.vim
diff --git a/vim/colors/chela_light.vim → colors/chela_light.vim b/vim/colors/chela_light.vim → colors/chela_light.vim
diff --git a/vim/colors/ir_black.vim → colors/ir_black.vim b/vim/colors/ir_black.vim → colors/ir_black.vim
diff --git a/vim/colors/vibrantink.vim → colors/vibrantink.vim b/vim/colors/vibrantink.vim → colors/vibrantink.vim
diff --git a/vim/colors/vividchalk.vim → colors/vividchalk.vim b/vim/colors/vividchalk.vim → colors/vividchalk.vim
diff --git a/vim/colors/wombat.vim → colors/wombat.vim b/vim/colors/wombat.vim → colors/wombat.vim
diff --git a/vim/doc/Align.txt → doc/Align.txt b/vim/doc/Align.txt → doc/Align.txt
diff --git a/vim/doc/NERD_tree.txt → doc/NERD_tree.txt b/vim/doc/NERD_tree.txt → doc/NERD_tree.txt
diff --git a/vim/doc/bufexplorer.txt → doc/bufexplorer.txt b/vim/doc/bufexplorer.txt → doc/bufexplorer.txt
diff --git a/vim/doc/camelcasemotion.txt → doc/camelcasemotion.txt b/vim/doc/camelcasemotion.txt → doc/camelcasemotion.txt
diff --git a/vim/doc/clojure.txt → doc/clojure.txt b/vim/doc/clojure.txt → doc/clojure.txt
diff --git a/vim/doc/command-t.txt → doc/command-t.txt b/vim/doc/command-t.txt → doc/command-t.txt
diff --git a/vim/doc/ft-ruby-omni.txt → doc/ft-ruby-omni.txt b/vim/doc/ft-ruby-omni.txt → doc/ft-ruby-omni.txt
diff --git a/vim/doc/ft-ruby-syntax.txt → doc/ft-ruby-syntax.txt b/vim/doc/ft-ruby-syntax.txt → doc/ft-ruby-syntax.txt
diff --git a/vim/doc/fugitive.txt → doc/fugitive.txt b/vim/doc/fugitive.txt → doc/fugitive.txt
diff --git a/vim/doc/matchit.txt → doc/matchit.txt b/vim/doc/matchit.txt → doc/matchit.txt
diff --git a/vim/doc/ragtag.txt → doc/ragtag.txt b/vim/doc/ragtag.txt → doc/ragtag.txt
diff --git a/vim/doc/rails.txt → doc/rails.txt b/vim/doc/rails.txt → doc/rails.txt
diff --git a/vim/doc/surround.txt → doc/surround.txt b/vim/doc/surround.txt → doc/surround.txt
diff --git a/vim/doc/symlink_docs → doc/symlink_docs b/vim/doc/symlink_docs → doc/symlink_docs
diff --git a/vim/doc/tComment.txt → doc/tComment.txt b/vim/doc/tComment.txt → doc/tComment.txt
diff --git a/vim/doc/tags → doc/tags b/vim/doc/tags → doc/tags
diff --git a/vim/doc/turbux.txt → doc/turbux.txt b/vim/doc/turbux.txt → doc/turbux.txt
diff --git a/vim/doc/vimux.txt → doc/vimux.txt b/vim/doc/vimux.txt → doc/vimux.txt
diff --git a/vim/ftplugin/elixir.vim → ftplugin/elixir.vim b/vim/ftplugin/elixir.vim → ftplugin/elixir.vim
diff --git a/vim/ftplugin/groovy.vim → ftplugin/groovy.vim b/vim/ftplugin/groovy.vim → ftplugin/groovy.vim
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
@@ -0,0 +1,2 @@
+map <silent> <LocalLeader>ra :wa<CR> :RunAllBazelTests<CR>
+map <silent> <LocalLeader>rb :wa<CR> :RunTargetBazelTests<CR>
diff --git a/vim/python_mappings.vim → python_mappings.vim b/vim/python_mappings.vim → python_mappings.vim
diff --git a/vim/ruby/fuzzy_file_finder.rb → ruby/fuzzy_file_finder.rb b/vim/ruby/fuzzy_file_finder.rb → ruby/fuzzy_file_finder.rb
diff --git a/vim/ruby_mappings.vim → ruby_mappings.vim b/vim/ruby_mappings.vim → ruby_mappings.vim
diff --git a/vim/undodir/.gitignore → undodir/.gitignore b/vim/undodir/.gitignore → undodir/.gitignore
diff --git a/vim b/vim
@@ -0,0 +1 @@
+.
diff --git a/vimrc b/vimrc
@@ -9,6 +9,8 @@ endif
 " Install vim plugins
 if filereadable(expand("~/.vimrc.bundles"))
   source ~/.vimrc.bundles
+elseif filereadable(expand("~/.vim/vimrc.bundles"))
+  source ~/.vim/vimrc.bundles
 endif
 
 if filereadable(expand("/etc/vim/vimrc.bundles"))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		map <silent> <LocalLeader>ra :wa<CR> :RunAllBazelTests<CR>
		map <silent> <LocalLeader>rb :wa<CR> :RunTargetBazelTests<CR>