From b8de46204247670b126ebb647bdf89f2769de164 Mon Sep 17 00:00:00 2001
From: Akash Manohar J <akash@akash.im>
Date: Fri, 29 Jun 2012 18:25:21 +0530
Subject: [PATCH] Adds all bash related stuff into one .cmd_profile

Signed-off-by: Akash Manohar J <akash@akash.im>
---
 .bash_pants   |  7 -------
 .bash_profile | 11 -----------
 .cmd_profile  | 32 +++++++++++++++++++++++++++-----
 3 files changed, 27 insertions(+), 23 deletions(-)
 delete mode 100644 .bash_pants

diff --git a/.bash_pants b/.bash_pants
deleted file mode 100644
index 6b2b7f5..0000000
--- a/.bash_pants
+++ /dev/null
@@ -1,7 +0,0 @@
-alias gl="git log --color --oneline --decorate"
-alias gs="git status -sb"
-alias gp="git push"
-alias gu="git pull"
-
-alias pg_start="pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start"
-alias pg_stop="pg_ctl -D /usr/local/var/postgres stop -s -m fast"
diff --git a/.bash_profile b/.bash_profile
index 878d74f..50af046 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,14 +1,3 @@
 source ~/dot-files/.cmd_profile
-source ~/dot-files/color_names.sh
-source ~/dot-files/git-completion.sh
-source ~/dot-files/ruby_identifier.sh
 
-export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 
-# Displays 1.9.3@gemset dir:branch
-PS1='\[\e[0;36m\][\[\e[0;30m\]$(rvm_version) \[\e[1;37m\]\W\[\e[0;35m\]$(__git_ps1 ":%s")\[\e[0;36m\]]⚡ \[\e[0;37m\]'
-
-PS1="\[\033[G\]$PS1"
-
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
-[[ -s $HOME/.pythonbrew/etc/bashrc ]] && source $HOME/.pythonbrew/etc/bashrc
diff --git a/.cmd_profile b/.cmd_profile
index b98e064..4f8d4ed 100644
--- a/.cmd_profile
+++ b/.cmd_profile
@@ -1,18 +1,40 @@
+source ~/dot-files/color_names.sh
+source ~/dot-files/git-completion.sh
+source ~/dot-files/ruby_identifier.sh
+
+PS1='\n\[\e[32;1m\]\W\[\e[0m\]\[\e[30m\] ($(__git_ps1 "%s, ")$(echo $RUBY_VERSION)) \n\[\e[36m\]⚡ \[\e[0m\]'
+
 [[ -s $HOME/.pythonbrew/etc/bashrc ]] && source $HOME/.pythonbrew/etc/bashrc
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
-[[ -s $HOME/dot-files/.bash_pants ]] && source $HOME/dot-files/.bash_pants
 
+export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 export PATH=$PATH:$HOME/bin
-export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
+
 
 # Emacs
-alias emacs="/usr/local/Cellar/emacs/HEAD/Emacs.app/Contents/MacOS/Emacs -nw"
-alias em="/usr/local/bin/emacsclient -t"
+export PATH=$PATH:/usr/local/Cellar/emacs/24.1/bin
+alias emacs="/usr/local/Cellar/emacs/24.1/Emacs.app/Contents/MacOS/Emacs -nw"
+alias em="/usr/local/Cellar/emacs/24.1/bin/emacsclient -t"
 
+# Java and JUBY
+export JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djboss.modules.system.pkgs=$JBOSS_MODULES_SYSTEM_PKGS -Djava.awt.headless=true -Djboss.server.default.config=standalone.xml"
+
+export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
+
+alias jr="jruby -S"
+alias jrh="jruby -J-Xmx1024m -S"
 
 # Rails
 alias be="bundle exec"
 alias rg="rails g"
 alias rgmo="rails g model"
 alias rgco="rails g controller"
-alias rgmi="rails g migration"
\ No newline at end of file
+alias rgmi="rails g migration"
+
+alias gl="git lg"
+alias gs="git status -sb"
+alias gp="git push"
+alias gu="git pull"
+
+alias pg_start="pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start"
+alias pg_stop="pg_ctl -D /usr/local/var/postgres stop -s -m fast"