Don't hardcode /etc/DIR_COLORS.

[zshconf.git] / zprofile

diff --git a/zprofile b/zprofile
index 2a4978d9bc591a49cfc67bb8430263d517e0b516..223baa497388663f808aa233d89f9c6c7007df44 100644 (file)
--- a/zprofile
+++ b/zprofile
@@ -1,47 +1,40 @@
-# /etc/zsh/zprofile
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.5 2008/05/23 12:02:51 tove Exp $
-
-# Load environment settings from profile.env, which is created by
-# env-update from the files in /etc/env.d
-if [ -e /etc/profile.env ] ; then
-       . /etc/profile.env
+# Load environment settings from profile.env, which is created by env-update
+# from the files in /etc/env.d
+if [[ -e /etc/profile.env ]]; then
+       source /etc/profile.env
 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:-/usr/bin/vim}
-export PAGER=${PAGER:-/usr/bin/less}
+# Default path
+path_front {,/usr,/usr/local}{/bin,/sbin} $HOME/bin
 
-# 077 would be more secure, but 022 is generally quite realistic
+# Default user settings
+export EDITOR=${EDITOR:-=vim}
+export PAGER=${PAGER:-=less}
 umask 022
 
-# Set up PATH depending on whether we're root or a normal user.
-# There's no real reason to exclude sbin paths from the normal user,
-# but it can make tab-completion easier when they aren't in the
-# user's PATH to pollute the executable namespace.
-#
-# It is intentional in the following line to use || instead of -o.
-# This way the evaluation can be short-circuited and calling whoami is
-# avoided.
-if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
-       PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
-else
-       PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
-fi
-export PATH="$HOME/bin:$PATH"
-unset ROOTPATH
-
 shopts=$-
 setopt nullglob
+
 for sh in /etc/profile.d/*.sh ; do
-       [ -r "$sh" ] && . "$sh"
+       if [[ -r $sh ]]; then
+               source $sh
+       fi
 done
+
 unsetopt nullglob
 set -$shopts
 unset sh shopts
 
 # Setup colours
-eval `dircolors --sh /etc/DIR_COLORS`
+eval `dircolors --sh`
 if [[ -n "$LS_COLORS" && -z "$COLORTERM" ]]; then
        export COLORTERM="ansi"
 fi
+
+# Configure terminal parameters
+stty stop ''
+case $KEYMAP in
+colemak)
+       stty eof '^S'
+       ;;
+esac