zprofile: Consider user .dircolors if it exists.

[zshconf.git] / zprofile

diff --git a/zprofile b/zprofile
index dba3a21854ea7b43fe821c9e51126b9570d66d10..fee77bc435a40e7128018279b95921e14c254a50 100644 (file)
--- a/zprofile
+++ b/zprofile
@@ -1,34 +1,46 @@
-# /etc/zsh/zprofile
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.5 2008/05/23 12:02:51 tove Exp $
+# Copyright © 2009-2011, 2022 Nick Bowler
+#
+# Default configuration for zsh login shells.
+#
+# License WTFPL2: Do What The Fuck You Want To Public License, version 2.
+# This is free software: you are free to do what the fuck you want to.
+# There is NO WARRANTY, to the extent permitted by law.
 
-# 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
+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
 
-# Setup the default path.
-path_front /{bin,sbin} /usr/{bin,sbin} /usr/local/{bin,sbin} $HOME/bin
-
 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 $HOME/.dircolors || dircolors --sh; } 2>/dev/null`
 if [[ -n "$LS_COLORS" && -z "$COLORTERM" ]]; then
        export COLORTERM="ansi"
 fi
+
+# Configure terminal parameters
+stty stop ''
+case $KEYMAP in
+colemak)
+       stty eof '^S'
+       ;;
+esac