zsh: compact path glob, avoid double source

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 46b0e662703896389e5ad0116e72992a6b9dff16..45ea3392b6130062cb6a8b789d38dcf4aee6099d 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,44 +1,32 @@
-### path
-# /usr/{pkg,local,games} are unix/bsdisms
-typeset -U path
-path=({~/,/,/usr/}sbin {~/,/,/usr/}bin /usr/pkg/{s,}bin /usr/X11R{7,6}/bin
-      /usr/local/{s,}bin /usr/games $path)
+[[ -v _sev_home ]] || export _sev_home=$HOME

 
 

-### posix
-export EDITOR=vim
-export PAGER=less
-export GREP_OPTIONS=--color=auto
-export LANG="en_US.UTF-8"
-export LC_CTYPE="$LANG"
+export ZDOTDIR=${XDG_CONFIG_HOME:-~/.config}/zsh

 
 

-### xdg
-export XDG_CONFIG_HOME=~/etc
-export XDG_CONFIG_DIRS=~/.config:/usr/pkg/etc/xdg:/usr/local/etc/xdg:/etc/xdg
-export XDG_DATA_HOME=~/share
-export XDG_DATA_DIRS=~/.local/share:/usr/pkg/share:/usr/local/share:/usr/share
-export XDG_CACHE_HOME=~/tmp
-export XDG_RUNTIME_DIR=~/tmp
+### load site-specific
+[[ -f ${ZDOTDIR:-~}/.zshenv.local ]] && source ${ZDOTDIR:-~}/.zshenv.local

 
 

-### applications
-export PYTHONSTARTUP=~/.pythonrc
-## perl
-(( ${+commands[perl]} )) && eval $(perl -I $XDG_DATA_HOME/perl5/lib/perl5 -Mlocal::lib=$XDG_DATA_HOME/perl5)
-## gpg
-export GPG_TTY=$(tty)
-if [[ ! -v SSH_AUTH_SOCK ]] {
-       # set up SSH auth socket and start GPG agent
-       export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+### fix broken term
+if [[ ! -v TERM ]] {
+    TERM=xterm-256color >/dev/null 2>&1

 }
 }

-gpg-connect-agent updatestartuptty /bye >/dev/null
-
-### freebsd
-if [[ "$OSTYPE" =~ "^freebsd" ]] {
-       export CLICOLOR=
-       export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
+if [[ -o interactive && $#terminfo -eq 0 ]] {
+    _oldterm=$TERM
+    export TERM=xterm >/dev/null 2>&1
+    print -P "%F{red}!!! Can't find terminfo for $_oldterm, using $TERM%f"
+    unset _oldterm

 }
 
 }
 

-### load site-specific
-if [[ -f ~/.zshenv.local ]] && [[ ! -v _ZSHENV_LOADED ]] {
-       export _ZSHENV_LOADED=
-       source ~/.zshenv.local
+# NOTE: see .zprofile comment for rationale on sourcing
+if [[ ! -v _sev_first_display && ( -v DISPLAY || -v WAYLAND_DISPLAY ) ]] {
+    ### update gpgagent to use graphical pinentry
+    # XXX: will be sourced by every new child shell if zsh is not used to
+    #      start the graphical session and the _sev_first_display var isn't
+    #      exported; for example, this previously happened with sway without a
+    #      display manager or launcher in front of it
+    export _sev_first_display=
+    _sev_refresh_gpgagent=
+    [[ ! -o login ]] && source ${ZDOTDIR:-~}/.zprofile
+} elif [[ ! -o login && $SHLVL -eq 1 && ${+TERMUX_VERSION} -eq 0 ]] {
+    ### early zprofile sourcing for first shell even if not a login shell
+    source ${ZDOTDIR:-~}/.zprofile

 }
 }