update bashrc

_bashrc

@@ -105,7 +105,7 @@ nvm use latest
 fi
 
 if [ "$TERM" = "screen" ]; then
-	PROMPT_COMMAND=~/screen_minidir
+	PROMPT_COMMAND=~/.screen_minidir
 	stty start ''
 fi
 
@@ -133,3 +133,31 @@ alias gdi="git diff"
 alias gdic="git diff -b --color-words"
 alias gbr="git branch"
 alias glog="git log --graph --date-order -C -M --pretty=format:\"<%h> %cd [%an] %s\""
+alias vim=~/source/vim73/src/vim
+alias vi=~/source/vim73/src/vim
+
+alias git=/usr/bin/git
+
+#alias ruby=~/.rubies/ruby-enterprise-1.8.7-2011.03/bin/ruby
+#alias gem=~/.rubies/ruby-enterprise-1.8.7-2011.03/bin/gem
+#alias irb=~/.rubies/ruby-enterprise-1.8.7-2011.03/bin/irb
+
+source "$HOME/.rubies/src/rubies.sh"
+
+
+source "$HOME/.git-completion"
+# prompt command
+hg_branch() {
+  hg branch 2> /dev/null | awk '{printf "(hg:" $1 ")"}'
+}
+
+git_branch() {
+  __git_ps1 '(git:%s)'
+}
+
+if [ "$color_prompt" = yes ]; then
+  PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$(git_branch)$(hg_branch)\n\$ '
+else
+  PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w$(git_branch)$(hg_branch)\n\$ '
+fi
+unset color_prompt force_color_prompt