# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1492632396 -3600
# Node ID b453b679dd576cabae4dd93dc1ab624e786e81eb
# Parent  16f295fdcd981dc6b2b37972a19d31f5cd13d2e7# Parent  2a3670fb2ef232ccffedc54725e87dcfc638c4d1
Merge accidental head on VPS server

diff -r 16f295fdcd98 -r b453b679dd57 bashrc
--- a/bashrc	Wed Apr 19 21:01:40 2017 +0100
+++ b/bashrc	Wed Apr 19 21:06:36 2017 +0100
@@ -39,8 +39,10 @@
 export LS_OPTIONS="$LS_OPTIONS -p"
 
 # Bold the command prompt and standardise on SUSE format
-export PS1='\[\033[01m\]\u@\h\[\033[00m\]:\[\033[01m\]\w\[\033[00m\]> '
+#export PS1='\[\033[01m\]\u@\h\[\033[00m\]:\[\033[01m\]\w\[\033[00m\]> '
+# With colour!
+export PS1='\[\033[01;38;5;34m\]\u\[\033[01;38;5;28m\]@\[\033[01;38;5;34m\]\h\[\033[39m\]:\[\033[01;38;5;26m\]\w$(test $PWD != / && echo -n /)\[\033[39m\]>\[\033[00m\] '
 
 # Fix "less" highlighting
-export LESS_TERMCAP_so=$'\033[30;47m'
+export LESS_TERMCAP_so=$'\033[30;48;5;247m'
 export LESS_TERMCAP_se=$'\033[0m'
\ No newline at end of file
diff -r 16f295fdcd98 -r b453b679dd57 dircolors
--- a/dircolors	Wed Apr 19 21:01:40 2017 +0100
+++ b/dircolors	Wed Apr 19 21:06:36 2017 +0100
@@ -64,7 +64,7 @@
 
 NORMAL 00       # global default, although everything should be something.
 FILE   00       # normal file - don't colour so that it works with light and dark terminals
-DIR    01;38;5;25    # directory
+DIR    01;38;5;26    # directory
 LINK   00;38;5;30    # symbolic link
 FIFO   48;5;236;38;5;178    # pipe
 SOCK   01;38;5;248;48;5;58    # socket