Fix vim indent and pull submodules correctly.

3 files changed, 6 insertions, 2 deletions

diff --git a/bin/setup.sh b/bin/setup.sh
index 7bca3e7..afc42e2 100755
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -18,7 +18,7 @@ if ! which git >/dev/null; then
 fi
 
 cd ~/dotfiles
-git submodule update --recursive
+git submodule update --init --recursive
 git submodule foreach pull
 
 cd
diff --git a/vimrc b/vimrc
index d894789..cd76320 100755
--- a/vimrc
+++ b/vimrc
@@ -17,6 +17,8 @@ set noswapfile
 set timeoutlen=1000
 set ignorecase
 set expandtab
+set shiftwidth=2
+set softtabstop=2
 set smarttab
 set smartcase
 set incsearch
diff --git a/zshrc b/zshrc
index 9d1d52e..9cec11b 100755
--- a/zshrc
+++ b/zshrc
@@ -30,7 +30,9 @@ export WORDCHARS=''
 setopt DVORAK
 
 alias ls="ls --color"
-alias vi="gvim --remote"
+if which gvim >/dev/null;
+  alias vi="gvim --remote"
+fi
 alias ff="fileutil --gfs_user=gfp-reporting"
 alias diff=colordiff