Merge config from original install.

[zshconf.git] / zprofile

diff --git a/zprofile b/zprofile
index 73a7cf83d0f4113d55a6cd3854d97b13f80051e0..2a4978d9bc591a49cfc67bb8430263d517e0b516 100644 (file)
--- a/zprofile
+++ b/zprofile
@@ -9,7 +9,7 @@ fi
 
 # You should override these in your ~/.zprofile (or equivalent) for per-user
 # settings.  For system defaults, you can add a new file in /etc/profile.d/.
-export EDITOR=${EDITOR:-/bin/nano}
+export EDITOR=${EDITOR:-/usr/bin/vim}
 export PAGER=${PAGER:-/usr/bin/less}
 
 # 077 would be more secure, but 022 is generally quite realistic
@@ -28,7 +28,7 @@ if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
 else
        PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
 fi
-export PATH
+export PATH="$HOME/bin:$PATH"
 unset ROOTPATH
 
 shopts=$-
@@ -39,3 +39,9 @@ done
 unsetopt nullglob
 set -$shopts
 unset sh shopts
+
+# Setup colours
+eval `dircolors --sh /etc/DIR_COLORS`
+if [[ -n "$LS_COLORS" && -z "$COLORTERM" ]]; then
+       export COLORTERM="ansi"
+fi