reorganize aliases, clean up binds, add zoxide

[dotfiles.git] / base / .zprofile

diff --git a/base/.zprofile b/base/.zprofile
index a0e4d369dde661480e70b46e5b3cf81b46187a6d..7a7fc107845a46a156892cc754039c35d9ed0038 100644 (file)
--- a/base/.zprofile
+++ b/base/.zprofile
@@ -1,65 +1,26 @@
-### general exports
+### exports
+## reset PATH to prevent /etc/zprofile from changing it
+# some distros put non-interactive PATH in env and interactive PATH in profile;
+# we want to make sure to always use ours regardless
+if [[ -v _backup_path ]] {
+    path=("${_backup_path[@]}" "${path[@]}")
+    export PATH
+    unset _backup_path
+}
+## common
 export EDITOR=vim
 export PAGER=less
-## lang
-export CHARSET=UTF-8
-export LANG="en_US.UTF-8"
-export LC_CTYPE="$LANG"
+## grep
+# XXX: deprecated in GNU
+export GREP_OPTIONS=--color=auto
 ## histfile
 export HISTFILE=~/.histfile
 export HISTSIZE=1000
 export SAVEHIST=1000
-## path
-# /usr/{pkg,local,games} are unix/bsdisms
-typeset -U PATH path
-path=({~/,/,/usr/}sbin {~/,/,/usr/}bin /usr/pkg/{s,}bin /usr/X11R{7,6}/bin
-      /usr/local/{s,}bin /usr/games "${path[@]}")
-export PATH
-typeset -U FPATH fpath
-fpath=(~/.zsh/functions/Prompts "${fpath[@]}")
-export FPATH
-
-### applications
 ## python
 export PYTHONSTARTUP=~/.pythonrc
 ## perl
-(( ${+commands[perl]} )) && eval $(perl -I $XDG_DATA_HOME/perl5/lib/perl5 -Mlocal::lib=$XDG_DATA_HOME/perl5 2>/dev/null)
-## gpg
-if (( ${+commands[gpg]} )) {
-    # SSH_AUTH_SOCK should be set in a remote SSH session for passthrough
-    # if it isn't, we are likely the first login shell on the local machine
-    # we also want to update USE_TTY if we are the login shell in graphics mode
-    if [[ ! -v SSH_AUTH_SOCK || -v DISPLAY ]] {
-        export GPG_TTY=$(tty)
-        export PINENTRY_USER_DATA=USE_TTY=$((! ${+DISPLAY}))
-        gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null
-        export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-    }
-}
-## 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
-## grep
-# XXX: deprecated in GNU
-export GREP_OPTIONS=--color=auto
-
-### tmp
-t="${TMPDIR:-/tmp}/home-$LOGNAME"
-h="$HOME/tmp"
-if [[ ! -e "$t" ]] {
-    mkdir -m 700 "$t" > /dev/null 2>&1
-    #TODO: check if dir exists after mkdir
-}
-#allow opaque entries to override link creation
-if [[ ! -e "$h" ]] {
-    ln -sf "$t" "$h" > /dev/null 2>&1
-}
-unset t
-unset h
+[[ -v commands[perl] ]] && eval $(perl -I $XDG_DATA_HOME/perl5/lib/perl5 -Mlocal::lib=$XDG_DATA_HOME/perl5 2>/dev/null)
 
 ### load site-specific
 if [[ -f ~/.zprofile.local ]] { source ~/.zprofile.local }