diff --git a/.bashrc b/.bashrc
index f91fa65..aa27644 100644
--- a/.bashrc
+++ b/.bashrc
@@ -57,9 +57,9 @@ if [ -n "$force_color_prompt" ]; then
 fi
 
 if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\] \[\033[01;36m\]\w\[\033[00m\] '
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\] \[\033[01;36m\]\w\[\033[00m\]'
 else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h \w '
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h \w'
 fi
 unset color_prompt force_color_prompt
 
@@ -116,6 +116,31 @@ if ! shopt -oq posix; then
   fi
 fi
 
+parse_git_branch() {
+     git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
+}
+
+export PS1="$PS1\[\033[33m\]\$(parse_git_branch)\[\033[00m\] "
+
 set -o vi
+export VISUAL=vim
+export EDITOR="$VISUAL"
 
 alias pvol="pactl set-sink-volume 0"
+alias activate="/home/ecow/activate.sh"
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/opt/anaconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/opt/anaconda3/etc/profile.d/conda.sh" ]; then
+        . "/opt/anaconda3/etc/profile.d/conda.sh"
+    else
+        export PATH="/opt/anaconda3/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+