From: Adam A.G. Shamblin <adam.shamblin@mapquest.com>
Date: Wed, 10 Sep 2014 15:50:23 +0000 (-0600)
Subject: Add team-specific .vimrc changes.
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=23feebcccb01709ea9e2fc8c0c38464431008ca8;p=dotfiles.git

Add team-specific .vimrc changes.
---

diff --git a/Makefile b/Makefile
index e78dda2..8e3126d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,3 +9,5 @@ build:
 	ln -s $(CURDIR)/dotbash_profile ~/.bash_profile
 	ln -s $(CURDIR)/dotvimrc ~/.vimrc
 	ln -s $(CURDIR)/dotgvimrc ~/.gvimrc
+	mkdir ~/env
+	mkdir ~/.saves
diff --git a/dotbash_profile b/dotbash_profile
index 9822c1b..da445e5 100644
--- a/dotbash_profile
+++ b/dotbash_profile
@@ -81,6 +81,14 @@ complete -F _envdir activate
 
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
 
+##################################################
+#
+#   Scala/Play Stuffs
+#
+##################################################
+
+export JAVA_OPTS="-server -Xms512m -Xmx2048m -XX:PermSize=512M -XX:MaxPermSize=1024M -XX:+CMSClassUnloadingEnabled"
+
 ##################################################
 #
 #   Aliases
diff --git a/dotvimrc b/dotvimrc
index a3c8525..4946bfb 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -1,5 +1,6 @@
 set nocompatible
 
+filetype plugin indent on
 syntax on
 
 set autoindent
@@ -20,10 +21,19 @@ set hlsearch
 set mouse=a
 set ttymouse=xterm2
 
-filetype plugin indent on
+function! SetupEnvironment()
+    let l:path = expand('%:p')
+    " MapQuest project-specific configurations
+    if l:path =~ '/Users/ashamblin14/workspace'
+        if &filetype == "javascript"
+            setlocal tabstop=2 softtabstop=2 shiftwidth=2
+        endif
+    endif
+endfunction
 
 autocmd FileType make setlocal noexpandtab
 
+au BufNewFile,BufRead *.js set filetype=javascript
 au BufNewFile,BufRead *.json set filetype=javascript
 au BufNewFile,BufRead Podfile,*.podspec set filetype=ruby
 au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx
@@ -35,4 +45,6 @@ au BufWritePost *.js :JSHint
 au BufNewFile,BufRead *.dat setlocal noexpandtab
 au BufNewFile,BufRead *.jade setlocal noexpandtab
 
+au BufNewFile,BufRead * call SetupEnvironment()
+
 call pathogen#infect()