Switch to dein

.gitignore

@@ -12,7 +12,7 @@
 
 vim/.netrwhist
 vim/temp
-vim/bundle
+vim/bundles
 
 zsh/.zsh_history*
 

README.md

@@ -17,25 +17,27 @@ Clone dah repo. I like to clone put it at `~/.dotlinker`
 
     ./scripts/bootstrap.sh
 
-### 3. May need to install the vim deps via Vundle
+### 3. May need to install the vim deps via [dein](https://github.com/Shougo/dein.vim)
 
-    ./scripts/vundle.sh
+    [within vim]
+    :call dein#install
 
 
 ## Dependencies
 
 #### Minimum:
 
 1. vim  - 7.4
-2. bash - (whatever is installed)
-3. git  - 2.*
-4. python - 2.7 and 3.5
+1. bash - (whatever is installed)
+1. git  - 2.*
+1. python - 2.7 and 3.5
 
 #### Ideal:
 
+1. vim - 8.0
 1. tmux - 1.9
-2. zsh  - 5.0
-3. urxvt or iter2
-4. ripgrep
-5. silver searcher
-6. inconsolata font
+1. zsh  - 5.0
+1. urxvt or iterm2
+1. ripgrep
+1. silver searcher
+1. Inconsolata font

scripts/bootstrap.sh

@@ -2,14 +2,9 @@
 
 DIR="$HOME/.dotfiles"
 
-if [ ! -d "$HOME/.vim/bundle/vundle" ]; then
-    echo "\nGrabing Vundle\n"
-    mkdir -p $DIR/vim/bundle
-    git clone https://github.com/gmarik/Vundle.git $DIR/vim/bundle/Vundle.vim
-fi
-
-echo "\nInstalling Bundles\n"
-vim +BundleInstall +qall
+echo "\nInstalling Vim Bundler Dein\n"
+sh $DIR/scripts/dein-install.sh $DIR/vim/bundles
+vim "+call dein#install()"
 
 echo "\nLinking dotfiles...\n"
 

scripts/dein-installer.sh

@@ -0,0 +1,89 @@
+#!/bin/sh
+# Standalone installer for Unixs
+# Original version is created by shoma2da
+# https://github.com/shoma2da/neobundle_installer
+
+if [ $# -ne 1 ]; then
+  echo "You must specify the installation directory!"
+  exit 1
+fi
+
+# Convert the installation directory to absolute path
+case $1 in
+  /*) PLUGIN_DIR=$1;;
+  *) PLUGIN_DIR=$PWD/$1;;
+esac
+INSTALL_DIR="${PLUGIN_DIR}/repos/github.com/Shougo/dein.vim"
+echo "Install to \"$INSTALL_DIR\"..."
+if [ -e "$INSTALL_DIR" ]; then
+  echo "\"$INSTALL_DIR\" already exists!"
+fi
+
+echo ""
+
+# check git command
+type git || {
+  echo 'Please install git or update your path to include the git executable!'
+  exit 1
+}
+echo ""
+
+# make plugin dir and fetch dein
+if ! [ -e "$INSTALL_DIR" ]; then
+  echo "Begin fetching dein..."
+  mkdir -p "$PLUGIN_DIR"
+  git clone https://github.com/Shougo/dein.vim "$INSTALL_DIR"
+  echo "Done."
+  echo ""
+fi
+
+# write initial setting for .vimrc
+echo "Please add the following settings for dein to the top of your vimrc (Vim) or init.vim (NeoVim) file:"
+{
+    echo ""
+    echo ""
+    echo "\"dein Scripts-----------------------------"
+    echo "if &compatible"
+    echo "  set nocompatible               \" Be iMproved"
+    echo "endif"
+    echo ""
+    echo "\" Required:"
+    echo "set runtimepath+=$INSTALL_DIR"
+    echo ""
+    echo "\" Required:"
+    echo "if dein#load_state('$PLUGIN_DIR')"
+    echo "  call dein#begin('$PLUGIN_DIR')"
+    echo ""
+    echo "  \" Let dein manage dein"
+    echo "  \" Required:"
+    echo "  call dein#add('$INSTALL_DIR')"
+    echo ""
+    echo "  \" Add or remove your plugins here:"
+    echo "  call dein#add('Shougo/neosnippet.vim')"
+    echo "  call dein#add('Shougo/neosnippet-snippets')"
+    echo ""
+    echo "  \" You can specify revision/branch/tag."
+    echo "  call dein#add('Shougo/vimshell', { 'rev': '3787e5' })"
+    echo ""
+    echo "  \" Required:"
+    echo "  call dein#end()"
+    echo "  call dein#save_state()"
+    echo "endif"
+    echo ""
+    echo "\" Required:"
+    echo "filetype plugin indent on"
+    echo "syntax enable"
+    echo ""
+    echo "\" If you want to install not installed plugins on startup."
+    echo "\"if dein#check_install()"
+    echo "\"  call dein#install()"
+    echo "\"endif"
+    echo ""
+    echo "\"End dein Scripts-------------------------"
+    echo ""
+    echo ""
+}
+
+echo "Done."
+
+echo "Complete setup dein!"

vim/bundle.vim

@@ -0,0 +1,65 @@
+" This file holds bundles for Vundle
+
+filetype off
+
+set runtimepath+=~/.vim/bundles/repos/github.com/Shougo/dein.vim
+
+if dein#load_state('~/.vim/bundles')
+  call dein#begin('~/.vim/bundles')
+
+  " Plugin manager
+  call dein#add('~/.vim/bundles/repos/github.com/Shougo/dein.vim')
+
+  " Style
+  call dein#add('vim-airline/vim-airline')
+  call dein#add('vim-airline/vim-airline-themes')
+  call dein#add('altercation/vim-colors-solarized')
+  call dein#add('ap/vim-css-color')
+
+  " Language
+  call dein#add('tpope/vim-git')
+  call dein#add('tpope/vim-fugitive')
+  call dein#add('plasticboy/vim-markdown')
+  call dein#add('mustache/vim-mustache-handlebars')
+  call dein#add('LaTeX-Box-Team/LaTeX-Box')
+  call dein#add('andersoncustodio/vim-tmux')
+  call dein#add('derekwyatt/vim-scala')
+  call dein#add('fatih/vim-go')
+  call dein#add('groenewege/vim-less')
+  call dein#add('rust-lang/rust.vim')
+  call dein#add('cespare/vim-toml')
+  call dein#add('pangloss/vim-javascript')
+  call dein#add('mxw/vim-jsx')
+  call dein#add('tikhomirov/vim-glsl')
+  call dein#add('dleonard0/pony-vim-syntax')
+
+  " Textobjs
+  runtime macros/matchit.vim
+  call dein#add('kana/vim-textobj-user')
+  call dein#add('kana/vim-textobj-line')
+  call dein#add('kana/vim-textobj-indent')
+  call dein#add('kana/vim-textobj-entire')
+  call dein#add('nelstrom/vim-textobj-rubyblock')
+  call dein#add('lucapette/vim-textobj-underscore')
+
+  " Utility
+  call dein#add('christoomey/vim-tmux-navigator')
+  call dein#add('nelstrom/vim-visual-star-search')
+  call dein#add('tpope/vim-unimpaired')
+  call dein#add('tpope/vim-surround')
+  call dein#add('tpope/vim-repeat')
+  call dein#add('tpope/vim-commentary')
+  call dein#add('tpope/vim-vinegar')
+  call dein#add('mileszs/ack.vim')
+  call dein#add('ctrlpvim/ctrlp.vim')
+  call dein#add('vim-scripts/gitignore')
+  call dein#add('justinmk/vim-sneak')
+  call dein#add('neomake/neomake')
+  call dein#add('benjie/neomake-local-eslint.vim')
+
+  call dein#end()
+  call dein#save_state()
+endif
+
+syntax enable
+filetype plugin indent on

vim/spell/en.utf-8.add

@@ -198,3 +198,6 @@ deserialized
 codec
 codecs
 struct
+Inconsolata
+ripgrep
+dein

vimrc

@@ -4,8 +4,9 @@
 
 set nocompatible    " Pffft... vi... Please...
 
-if filereadable(expand("~/.vim/vimrc.bundle"))
-    source ~/.vim/vimrc.bundle
+" Load plugins
+if filereadable(expand("~/.vim/bundle.vim"))
+  source ~/.vim/bundle.vim
 endif
 
 """"""""""""""""""""""""""""""""""""""""""""""""""