Browse Source

Update .gitmodules to point to new Vundle path, set helper variables
sooner to use them for Vundle, stop special casing windows

sdbarker 4 years ago
parent
commit
50d1a5d8e7
4 changed files with 8 additions and 12 deletions
  1. 1 0
      .gitignore
  2. 1 1
      .gitmodules
  3. 2 2
      git/.gitconfig
  4. 4 9
      vim/.vimrc

+ 1 - 0
.gitignore

@@ -1,4 +1,5 @@
 *.swp
+.netrwhist
 .sass-cache
 tags
 *.exe

+ 1 - 1
.gitmodules

@@ -1,3 +1,3 @@
 [submodule "vimrc/vimfiles/bundle/vundle"]
-	path = vimrc/vimfiles/bundle/vundle
+	path = vim/.vim/bundle/vundle
 	url = https://github.com/gmarik/vundle.git

+ 2 - 2
git/.gitconfig

@@ -1,6 +1,6 @@
 [user]
-name = sdbarker
-email = s[email protected]barker.com
+name = sbarker
+email = sbarker@gettyimages.com
 
 [core]
 editor = vim

+ 4 - 9
vim/.vimrc

@@ -12,8 +12,11 @@ set t_ut=
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
+let $VIMDIR = "$HOME/.vim"
+let $VIMRC = "$HOME/.vimrc"
+
 " set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/vundle/
+set rtp+=$VIMDIR/bundle/vundle/
 call vundle#rc()
 
 " alternatively, pass a path where Vundle should install bundles
@@ -46,14 +49,6 @@ Plugin 'vim-surround'
 
 filetype plugin on
 
-"if has("win32")
-"	let $VIMDIR = "$HOME\\vimfiles"
-"	let $VIMRC = "$HOME\\_vimrc"
-"else
-"	let $VIMDIR = "$HOME/.vim"
-"	let $VIMRC = "$HOME/.vimrc"
-"endif
-
 " Load keybindings
 source $VIMDIR/configs/keybindings.vim