Tweaks.

diff --git a/dotbash_profile b/dotbash_profile
index 616a0300055c484aed3d66ba69853b5266bf7acb..0f4b3f9bdbb478b9760e6f159c788d5bdc46182c 100644 (file)
--- a/dotbash_profile
+++ b/dotbash_profile
@@ -1,5 +1,6 @@
 export CLICOLOR=1
-export GREP_COLOR=always
+export GREP_OPTIONS="--color=auto"
+export GREP_COLOR="1;36"
 export PYTHONPATH="/usr/local/lib/python2.7/site-packages:$PYTHONPATH"
 export PYTHON_ENV_PATH=$HOME/env
 export POSTGRES_PATH=/Applications/Postgres.app/Contents/Versions/9.3/bin
@@ -39,8 +40,8 @@ function prompt_char {
         return 0
     fi
 
-    git_branch=$(git branch 2>/dev/null| sed -n '/^\*/s/^\* //p')
-    echo "($git_branch) $"
+    local GIT_BRANCH=$(git branch 2>/dev/null| sed -n '/^\*/s/^\* //p')
+    echo "($GIT_BRANCH) $"
 }
 export PS1='\[$ORANGE\]\u\[$RESET\] @ \[$YELLOW\]\h\[$RESET\] in \[$GREEN\]\w\[$RESET\]\n\[$BASE2\]$(prompt_char)\[$RESET\] '
 
@@ -85,11 +86,8 @@ complete -F _envdir activate
 #
 ##################################################
 
-export JAVA_OPTS="-server -Xms512m -Xmx2048m -XX:PermSize=512M -XX:MaxPermSize=1024M -XX:+CMSClassUnloadingEnabled"
-
-export SCALA_HOME=~/bin/scala
 export PLAY_PATH="/usr/local/play"
-export PATH=$PATH:$SCALA_HOME:$PLAY_PATH
+export PATH=$PATH:$PLAY_PATH
 
 ##################################################
 #

diff --git a/dotvimrc b/dotvimrc
index b4aa1c9210e54cc1ed7401a4e4c196cae8c23491..d4cc09f6d4d31be5b65648c5b1848c69047d447a 100644 (file)
--- a/dotvimrc
+++ b/dotvimrc
@@ -13,6 +13,7 @@ endif
 set autoindent
 set cindent
 set number
+set ruler
 set backupdir=~/.saves
 set noswapfile
 set expandtab
@@ -24,6 +25,7 @@ set noerrorbells
 set visualbell
 set vb
 set colorcolumn=80
+set cursorline
 set hlsearch
 set switchbuf=usetab
 
@@ -33,10 +35,10 @@ set guioptions-=T
 set guifont=Menlo:h12
 
 map <C-t> :tabnew<cr>
-map <C-tab> :bnext<cr>
-map <C-S-tab> :bprevious<cr>
+map <C-tab> :tabnext<cr>
+map <C-S-tab> :tabprevious<cr>
 
-set wildignore+=**/node_modules,**/node_modules/*,**/target,**/target/*
+set wildignore+=**/node_modules,**/node_modules/*,**/target,**/target/*,coverage/*,*.log,test/output
 
 let mapleader=","
 "let g:CommandTAcceptSelectionTabMap='<CR>'
@@ -47,6 +49,7 @@ map <leader>f :CommandT<cr>
 map <leader>a :NERDTreeToggle<cr>
 map <leader>b :Gblame<cr>
 map <leader>d :Gdiff<cr>
+map <leader>t :tag<cr>
 
 " Setup project/team-specific configurations
 function! SetupEnvironment()