# XXX: only call after relevant vars have been set up, defined early so that
# below code can utilize it after they do so
function _sev_zcleanup {
+ local x p y
+
# gpg forwarding
if [[ -d $_sev_gpg_forward_dir && ( -z $1 || $1 == 'gpg-forward' ) ]] {
# clean up forward dirs if its session is dead or we ask for it
}
}
# reset GNUPGHOME if we removed our own dir
- if [[ $GNUPGHOME =~ '/.ssh_forward/\d+/*$' && ! -e $GNUPGHOME ]]
+ if [[ $GNUPGHOME =~ '/.ssh_forward/\d+/*$' && ! -d $GNUPGHOME ]]
GNUPGHOME=${GNUPGHOME%$MATCH}
}
}
}
}
-
- unset x p y
}
function _sev_setpath {
- # NOTE: we utilize the fact that unique arrays keep the first occurrence and
- # remove any further occurences to capture elements from the old PATH
- # that we did not anticipate and shift them to the front, since they are
- # probably important to the system
- typeset -gU path fpath
# add as many generic paths as possible to keep the order we want
- # NOTE: /usr/{local,pkg,games} are unix/bsdisms
- # XXX: PREFIX not validated, non-posix but Termux uses it, maybe others
+ # NOTE: tied arrays path and fpath already exist, but are not unique (-U);
+ # we utilize the fact that unique arrays keep the first occurrence
+ # and remove any further occurences to check for elements from the
+ # old PATH that we did not anticipate and shift them to the front,
+ # since they are probably important to the system
+ typeset -gU path fpath
+ local -a syspath=("$path[@]")
+ # NOTE: /usr/{pkg,games} are unix/bsdisms
+ # NOTE: some systems (esp. research machines) may have multiple versions of
+ # packages installed in /opt/[pkg]/[ver]/bin or other dirs, managed
+ # with something like Environment Modules. this code does not account
+ # for this type of usage and will add all valid paths. any undesired
+ # paths can be removed using .zshenv.local.
+ # XXX: PREFIX not validated, non-POSIX but Termux uses it, maybe others
# XXX: XDG specifies ~/.local/bin as the only user-writable dir for
# executables, but we specify more; technically this is against spec
- syspath=("$path[@]")
- path=({{${_sev_home:-~},~}{/.local,},{$PREFIX,}{,/opt,/usr{,/local,/pkg}}}/{s,}bin
+ path=({{${_sev_home:-~},~}{/.local,},{$PREFIX,}{,/usr{,/local,/pkg},/opt{,/*{/*,}}}}/{s,}bin(N)
{$PREFIX,}/usr/{X11R{7,6}/bin,games}
# emulate Arch Linux flatpak-bindir.sh for use on other systems
{${XDG_DATA_HOME:-~/.local/share},{$PREFIX,}/var/lib}/flatpak/exports/bin)
- ((len=$#path))
+ local -i i len=$#path
path=("$path[@]" "$syspath[@]")
# remove bad paths
for (( i = 1; i <= $#path; i++ )) {
# shift valid system paths to the front if there are any left
((len > 0 && len < $#path)) && path=("${(@)path[len + 1, -1]}" "${(@)path[1, len]}")
# include our zsh dir in fpath. unlike above, we always prefer our paths
- fpath=({${ZDOTDIR:-~/.zsh},{${_sev_home:-~},~}/.zsh}/functions/**/*(/N) "$fpath[@]")
+ fpath=({${ZDOTDIR:-{${_sev_home:-~},~}/.zsh},{${_sev_home:-~},~}/.zsh}/functions/**/*(/N) "$fpath[@]")
# remove bad paths
for (( i = 1; i <= $#fpath; i++ )) {
if [[ ! -d $fpath[$i] ]] {
}
# FPATH is not exported by default
export FPATH
+ # un-unique system arrays for consistency
typeset +U path fpath
}
[[ -v _sev_home ]] || export _sev_home=$HOME
## fix broken term
-# NOTE: we do this here instead of .zshrc since we might echo stuff
+# NOTE: we do this here instead of .zshrc since we might print stuff
if [[ -t 1 ]] { # only if stdout is tty
[[ ! -v TERM ]] && export TERM=xterm-256color >/dev/null 2>&1
if [[ $#terminfo -eq 0 ]] {
# NOTE: do not set _sev_setup_path, it is set in zprofile
}
-### home dir setup & exports
+### home dir setup & additional exports
# XXX: traditionally, zshenv should just contain exports, and not touch the
-# filesystem. however, some system profile scripts that are sourced in the
-# system zprofile may attempt to do things that rely on some of these
-# vars. for example, `flatpak-bindir.sh` in the Arch Linux flatpak package
-# references $XDG_DATA_HOME with no fallback. since we do special handling
-# for these vars before we export them, we're forced to do it all here
-# instead of zprofile.
+# filesystem. however, our TMPDIR and XDG vars rely on mutable user paths
+# that may not exist, and as such need to be set up before the rest of the
+# system can use them. this is important as some environments include code
+# in the global zprofile, or source scripts of other shells in the global
+# zprofile, that may rely on our desired dir structure and vars pointing
+# to it. for example, `flatpak-bindir.sh` in the Arch Linux flatpak
+# package references $XDG_DATA_HOME with no fallback. since we do special
+# handling for these vars before we export them, we're forced to do it all
+# here instead of at the top of the zprofile.
## xdg local dir
# NOTE: need this for tmp, so confirm it exists.
-# XXX: perms are not specified for XDG dirs except runtime, but I think 760
-# makes the most sense. shouldn't break anything since no one else should
-# be poking around in our dir.
-[[ -e ~/.local ]] || mkdir -m760 ~/.local
+# XXX: perms are not specified for XDG dirs except runtime. 760 makes the most
+# sense, but we need to be a bit more permissive for zsu.
+[[ -e ~/.local ]] && chmod 755 ~/.local || mkdir -pm766 ~/.local
## tmp
# NOTE: specs say that POSIX tmp and XDG runtime directories should exist
# though it is not expressly spec compliant. this may also cause problems
# with disowned applications that still try to use the directories after
# the toplevel shell has already logged out and the dirs removed, but the
-# chances of that are slim.
+# chances of that are slim. this also needs to be adjusted for usermode
+# Xorg, as it requires $PREFIX/tmp/.X11-unix on most installs.
if [[ ! -v _sev_tmp ]] {
+ _sev_tmp=~/.local/tmp
# create personal TMPDIR under system tmp
- t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-/tmp}}}}/.home-$LOGNAME
+ # NOTE: under proot with uid remapping and shared /tmp, we can reuse old
+ # dir, without worrying about permission issues; intended for termux.
+ t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-${_sev_proot_real_user:-$LOGNAME}
[[ -e $t ]] || mkdir -m700 $t 2>/dev/null
- _sev_tmp=~/.local/tmp
if [[ ! -d $t ]] {
# fallback TMPDIR to bare local directory or existing softlink
[[ -o interactive ]] &&
[[ -h $_sev_tmp && ! -d _sev_tmp ]] && unlink $_sev_tmp 2>/dev/null
[[ ! -e $_sev_tmp ]] && mkdir -m700 $_sev_tmp 2>/dev/null
if [[ ! -d $_sev_tmp ]] {
- _sev_tmp=${$(mktemp 2>/dev/null):/tmp}
+ _sev_tmp=${$(mktemp 2>/dev/null):-/tmp}
[[ -o interactive ]] &&
print -P "%F{red}!!! Can't create tmp dir, using $_sev_tmp%f"
}
- } elif [[ -f $_sev_tmp || ( -d $_sev_tmp && ! -h $_sev_tmp ) ]] {
- # file or non-softlink directory is on our local dir
+ } elif [[ -e $_sev_tmp && ! -h $_sev_tmp ]] {
+ # non-softlink node is on our local dir
[[ -o interactive ]] &&
print -P "%F{orange}*** $_sev_tmp exists, can't link to tmp dir $t, ignoring it%f"
_sev_tmp=$t
} else {
- # link local dir to tmp dir
- if [[ -h $_sev_tmp && $_sev_tmp:P != $t:P ]] {
+ if [[ ! -v $_sev_tmp_keep_link && -h $_sev_tmp && $_sev_tmp:P != $t:P ]] {
[[ -o interactive ]] &&
print -P "%F{orange}*** $_sev_tmp links to ${_sev_tmp:P} and not ${t:P}, unlinking it%f"
- # XXX: race condition for existing sessions still using this dir
+ # NOTE: ln -f doesn't seem to work reliably with softlink
+ # directories, so explicitly remove the target if it exists
+ # XXX: potential race condition
+ # TODO: handle cleanup of old dir if it doesn't match?
unlink $_sev_tmp 2>/dev/null
}
- ln -s $t $_sev_tmp 2>/dev/null
- }
- if [[ -v _sev_tmp ]] {
- # ensure dir is clean
- _sev_zcleanup tmp
- # finally create our subdir for this session
- t=$_sev_tmp/.session.$$
- if ! mkdir -m700 $t 2>/dev/null; then
- [[ -o interactive ]] &&
- print -P "%F{red}!!! Can't create session tmp subdir $t, using $_sev_tmp%f"
- t=$_sev_tmp
- fi
- export _sev_tmp TMPDIR=$t TEMPDIR=$t TEMP=$t TMP=$t
+ if [[ ! -e $_sev_tmp ]] {
+ # link local dir to tmp dir
+ ln -s $t $_sev_tmp 2>/dev/null
+ }
}
+ # ensure dir is clean
+ _sev_zcleanup tmp
+ # finally create our subdir for this session
+ t=$_sev_tmp/.session.$$
+ if ! mkdir -m700 $t 2>/dev/null; then
+ [[ -o interactive ]] &&
+ print -P "%F{red}!!! Can't create session tmp subdir $t, using $_sev_tmp%f"
+ t=$_sev_tmp
+ fi
+ export _sev_tmp TMPDIR=$t TEMPDIR=$t TEMP=$t TMP=$t TMPPREFIX=$t/zsh
unset t
}
# include any of the below dirs there, but you never know what crazy shit
# people will do. I rather handle them sanely with our own code than let
# them override after the fact.
- [[ -e $XDG_CONFIG_HOME/user-dirs.dirs ]] &&
+ [[ -f $XDG_CONFIG_HOME/user-dirs.dirs ]] &&
emulate sh -c "source $XDG_CONFIG_HOME/user-dirs.dirs"
typeset -UT XDG_DATA_DIRS xdg_data_dirs
- if [[ -v XDG_DATA_HOME ]] {
- export XDG_DATA_HOME
- } elif [[ ! -e ~/.local/share ]] {
- mkdir -m760 ~/.local/share
- }
- xdg_data_dirs=($XDG_DATA_HOME /{opt,usr/local,usr/pkg,usr}/share
- ${XDG_DATA_DIRS:+${xdg_data_dirs%%/}})
+ [[ -v XDG_DATA_HOME ]] && export XDG_DATA_HOME
+ [[ -e ${XDG_DATA_HOME:-~/.local/share} ]] ||
+ mkdir -m760 ${XDG_DATA_HOME:-~/.local/share}
+ xdg_data_dirs=($XDG_DATA_HOME ${XDG_DATA_DIRS:+${xdg_data_dirs%%/}}
+ /{usr{,/local,/pkg},opt{,/*{/*,}}}/share(N))
+ xdg_data_dirs=($xdg_data_dirs(/N))
export XDG_DATA_DIRS
typeset -UT XDG_CONFIG_DIRS xdg_config_dirs
- if [[ -v XDG_CONFIG_HOME ]] {
- export XDG_CONFIG_HOME
- } elif [[ ! -e ~/.config ]] {
- mkdir -m760 ~/.config
- }
+ [[ -v XDG_CONFIG_HOME ]] && export XDG_CONFIG_HOME
+ [[ -e ${XDG_CONFIG_HOME:-~/.config} ]] ||
+ mkdir -m760 ${XDG_CONFIG_HOME:-~/.config}
# I am of the belief .local should follow FHS /usr/local...
- [[ -e ~/.local/etc ]] || ln -s ~/.config ~/.local/etc
- xdg_config_dirs=($XDG_CONFIG_HOME
- ${XDG_CONFIG_DIRS:+${xdg_config_dirs%%/}}
- {/opt,/usr/local,/usr/pkg,}/etc/xdg)
+ [[ -e ~/.local/etc ]] || ln -s ${XDG_CONFIG_HOME:-~/.config} ~/.local/etc
+ xdg_config_dirs=($XDG_CONFIG_HOME ${XDG_CONFIG_DIRS:+${xdg_config_dirs%%/}}
+ {,/usr{,/local,/pkg},opt{,/*{/*,}}}/etc/xdg(N))
+ xdg_config_dirs=($xdg_config_dirs(/N))
export XDG_CONFIG_DIRS
- if [[ -v XDG_STATE_HOME ]] {
- export XDG_STATE_HOME
- } elif [[ ! -e ~/.local/state ]] {
- mkdir -m760 ~/.local/state
- }
+ [[ -v XDG_STATE_HOME ]] && export XDG_STATE_HOME
+ [[ -e ${XDG_STATE_HOME:-~/.local/state} ]] ||
+ mkdir -m760 ${XDG_STATE_HOME:-~/.local/state}
if [[ -v XDG_CACHE_HOME ]] {
export XDG_CACHE_HOME
} else {
- if [[ -v _sev_tmp ]] {
- export XDG_CACHE_HOME=$_sev_tmp/.xdg.cache
- [[ -e $XDG_CACHE_HOME ]] || mkdir -m700 $XDG_CACHE_HOME
- } elif [[ ! -e ~/.cache ]] {
- mkdir -m700 ~/.cache
- }
+ export XDG_CACHE_HOME=$_sev_tmp/.xdg.cache
}
+ [[ -e ${XDG_CACHE_HOME:-~/.cache} ]] ||
+ mkdir -m700 ${XDG_CACHE_HOME:-~/.cache}
+ # NOTE: this can be set by systemd or other pre-shell supervisor, and if
+ # any services were started such as pipewire, we need to use the
+ # existing runtime dir to preserve runtime state
if [[ -v XDG_RUNTIME_DIR ]] {
- # NOTE: this can be set by systemd or other pre-shell supervisor, and
- # if any services were started such as pipewire, we need to use
- # the existing runtime dir so that we can get any existing
- # program sockets or other data
export XDG_RUNTIME_DIR
- } elif [[ -v TMPDIR ]] {
+ } else {
# make runtime dir in our session-specific tmpdir
export XDG_RUNTIME_DIR=$TMPDIR/.xdg.runtime
# same as in tmpdir creation, ensure dir doesn't exist
} elif [[ -e $XDG_RUNTIME_DIR ]] {
rm -rf $XDG_RUNTIME_DIR 2>/dev/null
}
- mkdir -m700 $XDG_RUNTIME_DIR 2>/dev/null
}
+ [[ ! -e $XDG_RUNTIME_DIR ]] &&
+ mkdir -m700 $XDG_RUNTIME_DIR 2>/dev/null
export _sev_setup_xdg=
}
## perl local lib
[[ ! -v PERL_LOCAL_LIB_ROOT && -v commands[perl] &&
- -d $XDG_DATA_HOME/perl5/lib/perl5 ]] &&
- eval $(perl -I$XDG_DATA_HOME/perl5/lib/perl5 \
- -Mlocal::lib=$XDG_DATA_HOME/perl5 2>/dev/null)
+ -d ${XDG_DATA_HOME:-~/.local/share}/perl5/lib/perl5 ]] &&
+ eval $(perl -I${XDG_DATA_HOME:-~/.local/share}/perl5/lib/perl5 \
+ -Mlocal::lib=${XDG_DATA_HOME:-~/.local/share}/perl5 2>/dev/null)
+
+## go
+if [[ -v commands[go] ]] {
+ [[ ! -v GOPATH ]] && export GOPATH=${XDG_DATA_HOME:-~/.local/share}/go:~/go
+ [[ ! -v GOBIN ]] && export GOBIN=~/.local/bin
+}
### load zshenv site-specific
autoload -Uz load-site-dotfile
projects / sev's projects / dotfiles.git / blobdiff