X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fvariables.bashrc;h=3298c767aaa772301b7993d19777e7a8dbbf7298;hb=bcf2f3f85cd948a432f8f4d86b112c59b07dbd27;hp=037e943a06ddf82c2a9be10a63e213da3059e44d;hpb=43148d7fd79913a1a1d995150223fe1a6ff934a4;p=profile.git diff --git a/.profile.d/variables.bashrc b/.profile.d/variables.bashrc index 037e943..3298c76 100644 --- a/.profile.d/variables.bashrc +++ b/.profile.d/variables.bashrc @@ -4,9 +4,10 @@ export SSHTERM_TITLE=-title export SSHTERM_EXEC=-e #export TERM=xterm-xfree86 export TERM=linux +unset LANG export LC_CTYPE=en_GB -if ls --help 2>/dev/null | grep -qs gnu.org; then - export LS_OPTIONS="--color=auto -F -b" +if ls --help 2>/dev/null | grep gnu.org >/dev/null; then + export LS_OPTIONS="--color=auto -F -b --time-style=long-iso" elif [ "$SYSTEM" = "Darwin" ]; then export LS_OPTIONS="-G -F -b" fi @@ -17,5 +18,15 @@ export SSHTERM="urxvt" export SSHTERM_TITLE="-title" export SSHTERM_EXEC="-e" export GREP_COLOR='0;33' +# cx: Lines of context; sl: Matching lines; mt: Search string; fn: Filename +# ln: Line number; bn: Byte offset; se: Separators. +colours=$(tput colors) +if [ $colours = 256 ]; then + export GREP_COLORS='cx=38;5;246:sl=:mt=33:fn=38;5;25:ln=38;5;82:bn=33:se=38;5;246' +elif [ $colours -gt 88 ]; then + export GREP_COLORS='cx=38;5;84:sl=:mt=33:fn=38;5;22:ln=38;5;44:bn=33:se=38;5;84' +else + export GREP_COLORS='cx=31:sl=:mt=33:fn=36:ln=34:bn=33:se=31' +fi export SCREENDIR="$HOME/.screen/$HOSTNAME" #mkdir -p "$SCREENDIR"