tweaks to zsh/env (xdg, dbus, gpg, tmp), sway, ...

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 8297e11cb1f2477739e95802eeccde66ec3646da..7e8dee7f33a512c63469a2ab9c3a352093422f4c 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,14 +1,33 @@
-export EDITOR=vim
-export XDG_CONFIG_HOME="$HOME/etc"
-export XDG_CONFIG_DIRS="$HOME/.config:/etc/xdg"
-export XDG_DATA_HOME="$HOME/share"
-export XDG_DATA_DIRS="$HOME/.local/share:/usr/local/share/:/usr/share/"
-export XDG_CACHE_HOME="$HOME/tmp"
+### load site-specific
+[[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
 
-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'
-export GREP_OPTIONS=--color=auto
+### fix broken term
+if [[ -o interactive && $#terminfo -eq 0 ]] {
+    _oldterm=$TERM
+    TERM=xterm-256color >/dev/null 2>&1
+    print -P "%F{red}!!! Can't find terminfo for $_oldterm, using $term%f"
+    unset _oldterm
+}
 
-export PYTHONSTARTUP=~/.pythonrc
+if [[ -o login ]] {
+    ### cd on login shell for convenience
+    cd ~
+} else {
+    if [[ ! -v _sev_first_display && ( -v DISPLAY || -v WAYLAND_DISPLAY ) ]] {
+        # this is to allow gpg and pinentry env to be updated
+        # XXX: will be sourced by every new child shell if zsh is not used to
+        #      start the graphical session, but since .zprofile is light that
+        #      shouldn't cause a noticeable performance impact
+        # NOTE: above happens with sway without a display manager or launcher
+        export _sev_first_display=
+        source ${ZDOTDIR:-~}/.zprofile
+        export _sev_first_display=0
+    } elif [[ $SHLVL == 1 ]] {
+        ### early zprofile sourcing for first shell
+        # NOTE: ensure profile is loaded for toplevel shells; should hopefully be 1
+        #       under some Xorg or cron implementations, which is where this would be most useful
+        source ${ZDOTDIR:-~}/.zprofile
+    }
+}
 
-export PUUSH_API_KEY=159C54A56C88394136BA1ACB6A9D8F80
+# vim: et sts=4 sw=4 ts=8 tw=79