use xdg for vim config, add viminfo to xdg

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index e1debfdb108a32b6028ce85b488c596b49eeefe0..462fefd89677447fe8e9e39ef09f94e8978eb0a8 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,28 +1,39 @@
-### 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)
+export ZDOTDIR=${XDG_CONFIG_HOME:-~/.config}/zsh
 
-### posix
-export EDITOR=vim
-export PAGER=less
-export GREP_OPTIONS=--color=auto
-export LANG="en_US.UTF-8"
-export LC_CTYPE="$LANG"
-
-### 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
+### fix broken term
+if [[ ! -v TERM ]] {
+    TERM=xterm-256color >/dev/null 2>&1
+}
+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 ]] {
-       source ~/.zshenv.local
+if [[ -o login ]] {
+    ### cd on login shell for convenience
+    # NOTE: we do this here and not in .zprofile since we occasionally might
+    # re-source .zprofile, and it's easier to just put the logic here...
+    cd ~
+} else {
+    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_disaply var isn't
+        #      exported; for example, this happens with sway without a display
+        #      manager or launcher in front of it
+        export _sev_first_display=
+        _sev_refresh_gpgagent= source ${ZDOTDIR:-~}/.zprofile
+    } elif [[ $SHLVL == 1 ]] {
+        ### early zprofile sourcing for first shell even if not a login 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
+    }
 }
+
+# vim: et sts=4 sw=4 ts=8 tw=79