X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fvariables.bashrc;h=ab30ff1245e991cfdc9f5ace1467aad96a42b44c;hb=909140c72cfb9c66bcb4189b975f2ccb18c11384;hp=a4fda1eff163b516d09171a87285b8a41bba1410;hpb=819bb88d5a014a23150b8fd609d194e883958674;p=profile.git

diff --git a/.profile.d/variables.bashrc b/.profile.d/variables.bashrc
index a4fda1e..ab30ff1 100644
--- a/.profile.d/variables.bashrc
+++ b/.profile.d/variables.bashrc
@@ -2,35 +2,11 @@ export SSHTERM=urxvtc
 export SSHTERM_TITLE=-title
 export SSHTERM_EXEC=-e
 unset LANG
-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
-export VISUAL=vim
-eval `dircolors 2>/dev/null` 2>/dev/null
 unset XMODIFIERS #:-(
-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'
+if find_working urxvt256c &>/dev/null; then
+  export SSHTERM=urxvt256c
 else
-  export GREP_COLORS='cx=31:sl=:mt=33:fn=36:ln=34:bn=33:se=31'
+  export SSHTERM=urxvt
 fi
-
-# Override SCREENDIR iff screen is not setuid.
-screen=$(which screen &>/dev/null)
-if [ ! -z "$screen" ]; then
-  if ! ls -l "$screen" | cut -d ' ' -f 1 | grep s >/dev/null; then
-    export SCREENDIR="$HOME/.screen/$HOSTNAME"
-  fi
-fi
-unset screen
-#mkdir -p "$SCREENDIR"
+export SSHTERM_TITLE="-title"
+export SSHTERM_EXEC="-e"