Updated files

.bashrc

@@ -1,26 +1,65 @@
-# This includes the bashrc distributed by 98-172 
-# Great Practical Ideas for Computer Scientists
-source ~/.bashrc_gpi
+source .git-prompt.sh
 
-# Add your own changes below...
-export PATH=/nyquist:$PATH:/cc0/bin:~/bin
+# Append to the history file, don't overwrite it
+shopt -s histappend
+
+# Check the window size after each command and, if necessary,
+# Update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+export PATH=$PATH:/opt/cc0/bin:~/bin
 export EDITOR=vim
 export CLICOLOR=1
+export HISTCONTROL=ignoreboth
+export HISTSIZE=250000
+export HISTFILESIZE=250000
 export LSCOLORS=DxGxcxdxCxegedabagacad
 export TERM=xterm-256color #256 color support
 export LESSOPEN='|/usr/local/bin/lesspipe.sh %s'
-PS1="\n╭\[\033[32m\][\w]\[\033[0m\]\n╰\[\033[1;36m\]\u\[\033[1;33m\]\$ \[\033[0m\]"
 
-export XLISPPATH=/nyquist/lib:/nyquist/runtime
+# Prompt differs if SSH'ed or not
+if [ -n "$SSH_CLIENT" ]; then
+PS1='\n╭\[\e[0;31m\]$(__git_ps1 "(%s)")\[\033[32m\][\w]\[\033[0m\]\n╰\[\033[1;36m\]\u@buttstuff\[\033[1;33m\]\$ \[\033[0m\]'
+else
+	PS1='\n╭\[\e[0;31m\]$(__git_ps1 "(%s)")\[\033[32m\][\w]\[\033[0m\]\n╰\[\033[1;36m\]\u\[\033[1;33m\]\$ \[\033[0m\]'
+fi
 
+export XLISPPATH=/etc/nyquist/lib:/etc/nyquist/runtime
+
+# Enable color support of ls and also add handy aliases
+# Mac OS doesn't support --color flag for ls, needs -G instead.
+if [[ `uname` = "Darwin" ]]
+then
+  alias ls='ls -G'
+else
+  alias ls='ls --color=auto'
+fi
+
+alias grep='grep --color=auto'
 alias coin='rlwrap coin' # by-setup-c0
-#alias kinit='kinit.sh'
 alias ed='ed -p:'
 alias sml='rlwrap sml'
-alias g='google-chrome-unstable'
-
 alias ocaml='rlwrap ocaml'
+alias m='ncmpcpp'
+alias killz='killall -9 '
+alias hidden='ls -a | grep "^\..*"'
+alias rm='rm -i'
+alias shell='ps -p $$ -o comm='
+alias math='rlwrap MathKernel'
+alias style='clang-format-3.5 -style=Google'
+alias telnet='rlwrap telnet'
 
+# Enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+fi
+
+bind "set completion-ignore-case on"
+
+# Turn off the ability for other people to message your terminal using wall
+mesg n
 
 # OPAM configuration
 . /home/amgutier/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true