changeset 62:b453b679dd57

Merge accidental head on VPS server
author IBBoard <dev@ibboard.co.uk>
date Wed, 19 Apr 2017 21:06:36 +0100
parents 16f295fdcd98 (diff) 2a3670fb2ef2 (current diff)
children 327c85286b54
files bashrc
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bashrc	Wed Apr 19 20:55:58 2017 +0100
+++ b/bashrc	Wed Apr 19 21:06:36 2017 +0100
@@ -39,9 +39,9 @@
 export LS_OPTIONS="$LS_OPTIONS -p"
 
 # Bold the command prompt and standardise on SUSE format
-#export PS1='\[\033[01m\]\[$(ppwd)\]\u@\h\[\033[00m\]:\[\033[01m\]\w\[\033[00m\]> '
+#export PS1='\[\033[01m\]\u@\h\[\033[00m\]:\[\033[01m\]\w\[\033[00m\]> '
 # With colour!
-PS1='\[\033[01;38;5;34m\]\[$(ppwd)\]\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\] '
+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;48;5;247m'
--- a/hgrc	Wed Apr 19 20:55:58 2017 +0100
+++ b/hgrc	Wed Apr 19 21:06:36 2017 +0100
@@ -25,6 +25,10 @@
 cmd.imdiff = sh  
 opts.imdiff = -c 'compare $0 $1 compared.png; display compared.png'
 
+[pager]
+pager = LESS='FSRX' less
+ignore = version, help, update, serve, record
+
 %include ~/.hgrc-certs
 
 %include ~/.hgrc-auth