removed dead aliases

.bash_aliases

@@ -1,10 +1,7 @@
 # vim: set ft=sh
-
-alias pd="pushd $1"
 alias cdp="cd -"
-
 alias ..='cd ..'
-
+alias pd="pushd $1"
 # list files
 alias ll='ls --color=always -l'
 
@@ -14,33 +11,15 @@ alias fbake='bundle exec rake clobber default test:xunit'
 alias bakeserver='bundle exec rake clobber localci build_env=dev'
 alias uberbake='~/uberbake.txt'
 
-function symlink(){
-  bake nuget:symlink[$1,$2]
-}
-
 #tools
 alias s='start Source/*.sln'
-alias ss='startserver'
 alias projects='cd /c/Projects'
 alias resrc='source ~/.bash_aliases && source ~/.bashrc && source ~/.profile'
 alias role='whoami -groups -fo list | grep -i'
 alias fu='find ./ -type f -print0 | xargs -0 grep -n $1'
 
-function cc()
-{
-  if [ -z "$1" ]
-    then 
-      echo "bake compass:compile"
-      bake compass:compile
-  else
-    echo "compass compile"
-    compass compile $1
-  fi
-}
-
 #git
 alias gs='git status'
-alias ehinit='git init --template=C:/Users/adve/eh-git'
 
 alias diff='git difftool'
 alias diffc='git difftool --cached'
@@ -48,10 +27,7 @@ alias gpr='git pull --rebase'
 alias gmt='git mergetool'
 alias grc='git rebase --continue'
 alias gk='git fetch origin; git remote prune origin; gitk --all &'
-alias sym='~/nugetsymlink'
-alias cw='compass watch $1'
 alias dlb='dml'
-
 # delete merged local branches
 function dml(){
   for b in `git branch --merged | grep -v \*`; do git branch -D $b; done
@@ -76,3 +52,11 @@ function clone()
     fi
   fi
 }
+
+function vim(){
+  if [[ $# -eq 0 ]]; then
+    gvim &
+  else
+    gvim --remote-tab-silent "$@" &
+  fi
+}

.bashrc

@@ -1,15 +1,7 @@
-# vim: set ft=sh
-# https://github.com/smerrell/dotfiles
-#
+#!/bin/bash
 
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 
-#
-# Initialization
-#
-if [ -d "${HOME}/bin" ] ; then
-    PATH=${HOME}/bin:${PATH}
-fi
 
 if [ -d "${HOME}/tools/vim" ] ; then
     PATH=${HOME}/tools/vim:${PATH}
@@ -19,13 +11,6 @@ if [ -d "${HOME}/.bin" ] ; then
     PATH=${HOME}/.bin:${PATH}
 fi
 
-#
-# Dircolors
-#
-#if [ -f ~/.dircolors ]; then
- # eval `dircolors -b ~/.dircolors`
-#fi
-
 # see environ manfile
 export EDITOR=vim       # Default Editor
 export VISUAL=$EDITOR   # Visual not really used differently from EDITOR anymore
@@ -42,13 +27,16 @@ HISTSIZE=50000                            # For a huge history
 export HISTIGNORE="[   ]*:&:bg:fg:exit"   # Don't save these commands in the history
 shopt -s histappend                       # Append to the history file, not overwrite
 
-#
-# Bash behavior
-#
-shopt -s checkwinsize   # Checks window size to get proper line wrapping
-shopt -s cdspell        # Corrects minor spelling errors when cd-ing
-set -o vi               # Set prompt to vi mode
-set -o notify           # Report status of terminated background jobs immediately
+# source development settings
+if [ -f ~/.dev_profile ]; then
+      . ~/.dev_profile
+fi
+
+# if there is a C:/Projects folder on this box
+# then I'm obviously using my work computer
+if [ -d "C:/Projects" ]; then
+  . ~/.work_profile
+fi
 
 # Load pretty colors
 if [ -f ~/.shell_colors ]; then

.dev_profile

@@ -1 +1,34 @@
 #!/bin/bash
+
+export ERLBIN="/d/Programs/erl6.0/erts-6.0/bin"
+if [ -d "$ERLBIN" ]; then
+  PATH=${ERLBIN}:${PATH}
+fi
+
+
+if [ -d "${HOME}/tools/plugins" ] ; then
+    PATH=${HOME}/tools/plugins:${PATH}
+fi
+
+# see environ manfile
+export EDITOR=vim       # Default Editor
+export VISUAL=$EDITOR   # Visual not really used differently from EDITOR anymore
+export LESS='-iMR'      # Case insensite search, verbose prompting and raw output
+export PAGER=less       # Used to display text / man files
+export PORT=3001
+
+#
+# History
+#
+HISTCONTROL=ignoredups                    # No duplicate commands in history
+HISTSIZE=50000                            # For a huge history
+export HISTIGNORE="[   ]*:&:bg:fg:exit:clear"   # Don't save these commands in the history
+shopt -s histappend                       # Append to the history file, not overwrite
+
+#
+# Bash behavior
+#
+shopt -s checkwinsize   # Checks window size to get proper line wrapping
+shopt -s cdspell        # Corrects minor spelling errors when cd-ing
+set -o vi               # Set prompt to vi mode
+set -o notify           # Report status of terminated background jobs immediately

.work_profile

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 if [[ $DEBUG ]] ; then
   echo "I'm on my work machine!"
 fi