From 40c5d167afed2c166eb277b74afae19b8b30760e Mon Sep 17 00:00:00 2001 From: "Alexander Gehrke (crater2150)" Date: Tue, 5 Jan 2016 03:45:19 +0100 Subject: [PATCH] clean up zshrc, zprofile --- zprofile | 12 +++++++----- zshrc | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/zprofile b/zprofile index 634b49e..eaacb56 100644 --- a/zprofile +++ b/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 diff --git a/zshrc b/zshrc index 56c731c..04fff3c 100644 --- a/zshrc +++ b/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