Moved bash/main into scriptlets. Added to main bashrc

bash/scriptlets/aliases

@@ -0,0 +1,31 @@
+# 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'
+
+# Use vim if possible instead of vi
+if [[ $(command -v vim) ]]; then
+	alias vi='vim'
+fi
+
+# Reload bashrc
+alias bashreload="source ~/.bashrc"
+
+# Easy calculator instead of bc
+alias pc='python -ic "from __future__ import division; from math import *"'
+
+# Moving around
+alias ~='cd ~'
+alias ..='cd ..'

bash/scriptlets/colours

@@ -0,0 +1,17 @@
+### Colors to Vars ### {{{
+## Inspired by http://wiki.archlinux.org/index.php/Color_Bash_Prompt#List_of_colors_for_prompt_and_Bash
+## Terminal Control Escape Sequences: http://www.termsys.demon.co.uk/vtansi.htm
+## Consider using some of: https://gist.github.com/bcap/5682077#file-terminal-control-sh
+## Can unset with `unset -v {,B,U,I,BI,On_,On_I}{Bla,Red,Gre,Yel,Blu,Pur,Cya,Whi} RCol`
+RCol='\[\e[0m\]'	# Text Reset
+
+# Regular					Bold						Underline					High Intensity				BoldHigh Intensity			Background				High Intensity Backgrounds
+Bla='\[\e[0;30m\]';	BBla='\[\e[1;30m\]';	UBla='\[\e[4;30m\]';	IBla='\[\e[0;90m\]';	BIBla='\[\e[1;90m\]';	On_Bla='\e[40m';	On_IBla='\[\e[0;100m\]';
+Red='\[\e[0;31m\]';	BRed='\[\e[1;31m\]';	URed='\[\e[4;31m\]';	IRed='\[\e[0;91m\]';	BIRed='\[\e[1;91m\]';	On_Red='\e[41m';	On_IRed='\[\e[0;101m\]';
+Gre='\[\e[0;32m\]';	BGre='\[\e[1;32m\]';	UGre='\[\e[4;32m\]';	IGre='\[\e[0;92m\]';	BIGre='\[\e[1;92m\]';	On_Gre='\e[42m';	On_IGre='\[\e[0;102m\]';
+Yel='\[\e[0;33m\]';	BYel='\[\e[1;33m\]';	UYel='\[\e[4;33m\]';	IYel='\[\e[0;93m\]';	BIYel='\[\e[1;93m\]';	On_Yel='\e[43m';	On_IYel='\[\e[0;103m\]';
+Blu='\[\e[0;34m\]';	BBlu='\[\e[1;34m\]';	UBlu='\[\e[4;34m\]';	IBlu='\[\e[0;94m\]';	BIBlu='\[\e[1;94m\]';	On_Blu='\e[44m';	On_IBlu='\[\e[0;104m\]';
+Pur='\[\e[0;35m\]';	BPur='\[\e[1;35m\]';	UPur='\[\e[4;35m\]';	IPur='\[\e[0;95m\]';	BIPur='\[\e[1;95m\]';	On_Pur='\e[45m';	On_IPur='\[\e[0;105m\]';
+Cya='\[\e[0;36m\]';	BCya='\[\e[1;36m\]';	UCya='\[\e[4;36m\]';	ICya='\[\e[0;96m\]';	BICya='\[\e[1;96m\]';	On_Cya='\e[46m';	On_ICya='\[\e[0;106m\]';
+Whi='\[\e[0;37m\]';	BWhi='\[\e[1;37m\]';	UWhi='\[\e[4;37m\]';	IWhi='\[\e[0;97m\]';	BIWhi='\[\e[1;97m\]';	On_Whi='\e[47m';	On_IWhi='\[\e[0;107m\]';
+### End Color Vars ### }}}

bash/scriptlets/history

@@ -0,0 +1,17 @@
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+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)
+HISTSIZE=10000
+HISTFILESIZE=20000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar

bash/scriptlets/ps1

@@ -67,7 +67,9 @@ function __prompt_command() {
 	PS1+="@"
 
 	if color ; then
-		if [[ $HOSTNAME == 'lilo'* ]];  then
+		if [[ $HOSTNAME == 'fatserf' ]]; then
+			PS1+="${Pur}\H${RCol}"
+		elif [[ $HOSTNAME == 'lilo'* ]];  then
 			PS1+="${BWhi}\H${RCol}"
 		elif [[ $HOSTNAME == 'hg'* ]]; then
 			PS1+="${BRed}\H${RCol}"