diff --git a/bash/bash_aliases b/bash/bash_aliases
index fac031f..b56e9bc 100644
--- a/bash/bash_aliases
+++ b/bash/bash_aliases
@@ -1,12 +1,25 @@
-function parse_git_branch {
-    git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
-}
+export EDITOR='vi'
+export WORKON_HOME=$HOME/.virtualenvs
+export LC_CTYPE="en_US.UTF-8"
+export LANG="en_US.UTF-8"
 
-if [ -f $HOME/.srv_name ]; then
-    SRV_NAME=`cat $HOME/.srv_name`
-    PS1='\u@\h($SRV_NAME):\W $(parse_git_branch)\n\$ '
+alias tmux='tmux -u'
+alias t='tmux.py'
+alias reKill='reKill.py'
+alias pysmtp='python -m smtpd -n -c DebuggingServer localhost:1025'
+alias resetterminal='echo -n -e "\033]0;\007"'
+alias gitpretty="git log --pretty=format:'%h : %Cblue%aN%Creset : %Cred%d%Creset : %s' --graph"
+
+if [[ -r $HOME/.host_nickname ]]; then
+    HOST_NICKNAME=`cat ${HOME}/.host_nickname`
 else
-    PS1='\u@\h:\W $(parse_git_branch)\n\$ '
+    HOST_NICKNAME=`hostname -s`
 fi
 
-export PS1
+export PS1="\u@${HOST_NICKNAME}:\W \$ "
+
+if [[ -r $HOME/.${HOST_NICKNAME}_bash_profile ]]; then
+    source $HOME/.${HOST_NICKNAME}_bash_profile
+else
+    echo "WARNING: Can't find custom bash_profile"
+fi