clean up zshrc, zprofile

zprofile

@@ -1,11 +1,17 @@
-# gentoo specific
+# /etc/zsh/zprofile
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile-1,v 1.1 2010/08/15 12:21:56 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
 fi
 
+setopt nullglob
 for sh in /etc/profile.d/*.sh ; do
 	[ -r "$sh" ] && . "$sh"
 done
+unsetopt nullglob
 
 if [ -e "$HOME/.profile" ]; then
 	. "$HOME/.profile"
@@ -28,9 +34,5 @@ export PATH
 unset ROOTPATH
 
 shopts=$-
-setopt nullglob
-
-
-unsetopt nullglob
 set -$shopts
 unset sh shopts

zshrc

@@ -2,8 +2,6 @@
 HISTFILE=~/.histfile
 HISTSIZE=100000
 SAVEHIST=100000
-GPG_TTY=`tty`
-export GPG_TTY
 
 setopt autocd extendedglob notify correct autonamedirs
 setopt list_ambiguous autopushd  pushd_ignore_dups
@@ -31,6 +29,8 @@ for i in  ${ZDOTDIR:-/etc/zsh}/aliases/*~${ZDOTDIR:-/etc/zsh}/aliases/*.zwc; do
     . $i
 done
 
+#ZMODLOAD_BLACKLIST=( prompt )
+
 stty -ixon
 
 . ${ZDOTDIR:-/etc/zsh}/modules/loader.zsh && mod_init
@@ -44,4 +44,5 @@ zstyle ':completion:*:descriptions' format ‘%B%d%b’
 zstyle ':completion:*:messages' format ‘%d’
 zstyle ':completion:*:warnings' format ‘No matches for: %d’
 
+
 exists todo && todo