-echo logout
-clear
+### cleanup
+# XXX: since .zlogout isn't guaranteed to have been run in the same shell as
+# our .zprofile was (since we source it in .zshenv for SHLVL=1 among other
+# situations) we are not guaranteed to clean up our current session's tmp,
+# but it should be cleared out on next session launch
+_sev_zcleanup
+## unset vars that use our tmp since above will remove them
+unset XDG_CACHE_HOME XDG_RUNTIME_DIR
+## clean up any remaining sockets from gpg forwarding
+[[ -v _GNUPG_SOCK_DEST_BASE ]] && rm -f $_GNUPG_SOCK_DEST_BASE*(N=)
+
+if [[ -o interactive ]] {
+ echo logout
+ clear
+}
### load site-specific
if [[ -f ~/.zlogout.local ]] { source ~/.zlogout.local }
-# vim: set et sts=4 sw=4 ts=8 tw=79 :
+# vim: et sts=4 sw=4 ts=8 tw=79