--- /dev/null
+#
+
+alias ll='ls -l'
+alias la='ls -A'
+alias l='ls -CF'
+
+alias psp='sudo ps aux | grep '
+alias shtop='sudo htop'
+
+alias scs='screen -ls'
+alias scr='screen -r'
+
+alias psp='ps aux | grep '
+alias vd='vimdiff'
+alias gsh='git-sh'
+
+alias gitb='git branch'
+alias gitc='git checkout'
+alias gitm='git commit -a'
+alias gitd='git diff'
+alias gita='git add'
+alias gitp='git push'
+alias gits='git status'
+alias gitf='git flow'
+alias gitl='git log'
+alias gitkb='git log --graph --simplify-by-decoration --pretty=format:'%d' --all'
+alias gitkl="git log --graph --pretty=format:'%C(yellow)%h%Creset%C(blue)%d%Creset %C(white bold)%s%Creset %C(white dim)(by %an %ar)%Creset' --all"
+
+alias apu='sudo apt-get update'
+alias apug='sudo apt-get upgrade'
+alias api='sudo apt-get install'
+alias apc='aptitude show'
+alias aps='aptitude search'
+alias apr='sudo apt-get purge'
+alias apl='sudo vi /etc/apt/sources.list'
+
+alias chrome_audio='google-chrome --audio-buffer-size=2048'
+
+# Mplayer
+alias play="mplayer -msgcolor -msgmodule"
+alias playcd="mplayer cdda://"
+#alias playdvd="mplayer dvd://"
+alias playdvd="mplayer -mouse-movements dvdnav://"
+alias playvcd="mplayer vcd://2"
+
+# BBC Radio
+bbcradio() { local s PS3="Select a station: ";select s in 1 1x 2 3 4 4x 5l 5lsp 6 "Asian Network an" "Nations & Local lcl";do break;done;s=($s);play -playlist "http://www.bbc.co.uk/radio/listen/live/r"${s[@]: -1}".asx";}
+alias bbclondon="play -playlist http://www.bbc.co.uk/radio/listen/live/bbclondon.asx"
+alias bbcworld="play -playlist http://www.bbc.co.uk/worldservice/meta/tx/nb/live/eneuk.asx"
+
+alias caca="mplayer tv:// -vo caca -vf mirror -really-quiet"
+
+alias rmpyc="find ./ -iname "*.pyc" -exec rm {} \;"
+
+alias gk="git diff $* | kompare -"
+
+alias rmm='/bin/rm'
+alias mvv='/bin/mv'
+
+# Some more alias to avoid making mistakes:
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+
+alias rtags='ctags --exclude=*.js --exclude=example -Rf .tags'
+alias rpyc='find ./ -iname "*.pyc" -exec rm {} \;'
+
--- /dev/null
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# don't put duplicate lines in the history. See bash(1) for more options
+# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
+HISTCONTROL=$HISTCONTROL${HISTCONTROL+:}ignoredups
+# ... or force ignoredups and ignorespace
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# make less more friendly for non-text input files, see lesspipe(1)
+#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+ debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+ xterm-color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+ if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+ # We have color support; assume it's compliant with Ecma-48
+ # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+ # a case would tend to support setf rather than setaf.)
+ color_prompt=yes
+ else
+ color_prompt=
+ fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+ PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+ PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+ PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+ ;;
+*)
+ ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+ test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+ alias ls='ls --color=auto'
+ alias dir='dir --color=auto'
+ alias vdir='vdir --color=auto'
+
+ alias grep='grep --color=auto'
+ alias fgrep='fgrep --color=auto'
+ alias egrep='egrep --color=auto'
+fi
+
+# some more ls aliases
+alias ll='ls -l'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+ . ~/.bash_aliases
+fi
+
+# 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 ] && ! shopt -oq posix; then
+ . /etc/bash_completion
+fi
+
+export ANDROID_HOME=$HOME/dev/android/adt/sdk/tools:$HOME/dev/android/adt/sdk/platform-tools/
+
+export PATH=$PATH:~/bin:/usr/local/sbin:/usr/sbin:/sbin:$ANDROID_HOME
+
+export CONCURRENCY_LEVEL=4
+
+export PYTHONDONTWRITEBYTECODE=True
+export PYTHONPATH=$PYTHONPATH:~/dev/timeside/timeside:~/dev/telemeta/telemeta:~/dev/deefuzzer/deefuzzer
+
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
+
+