X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/e701ed226fd9bff7e5ac749fef8c7c939f82b15e..HEAD:/zshenv diff --git a/zshenv b/zshenv index c184a18..db826fe 100644 --- a/zshenv +++ b/zshenv @@ -6,24 +6,34 @@ export XDG_CACHE_HOME="$HOME/.cache" export HOST=$(hostname) # the default command to open a new terminal -export TERMINAL=kitty +export TERMINAL=wezterm export THEME=nord # gpg export GNUPGHOME="$XDG_CONFIG_HOME/gnupg" +#TODO this should probably be set for all shells? +if [[ -n "$DISPLAY" ]]; then + export PINENTRY_USER_DATA="qt" +fi + # ssh export SSH_AUTH_SOCK=${SSH_AUTH_SOCK:-"$XDG_RUNTIME_DIR/ssh-agent.socket"} export MAILDIR="$HOME/mail" +# pass +export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass" + if hash systemctl 2>/dev/null; then systemctl --user import-environment \ - XDG_CACHE_HOME \ - XDG_CONFIG_HOME \ - XDG_DATA_HOME \ GNUPGHOME \ MAILDIR \ - SSH_AUTH_SOCK + PATH \ + PASSWORD_STORE_DIR \ + SSH_AUTH_SOCK \ + XDG_CACHE_HOME \ + XDG_CONFIG_HOME \ + XDG_DATA_HOME fi # vim stuff @@ -48,9 +58,6 @@ export RXVT_SOCKET="$XDG_RUNTIME_DIR/urxvtd-$HOST" export MPV_HOME="$XDG_CONFIG_HOME/mpv" export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer" -# pass -export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass" - # weechat export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat" @@ -68,5 +75,3 @@ export AUR_PAGER=ranger # cmake export CMAKE_EXPORT_COMPILE_COMMANDS=1 export CTEST_OUTPUT_ON_FAILURE=1 - -export WORKSPACE=~/src/fpp/