dwb: remove config

[dotfiles.git] / zshenv

diff --git a/zshenv b/zshenv
index 0ce4be9e4c8db071dbb4b556f4f21c666f8b4ad2..8482db30c5dd2e5bcea56efb217c43d3feb18999 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -5,10 +5,19 @@ export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CACHE_HOME="$HOME/.cache"
 export HOST=$(hostname)
 
-systemctl --user import-environment \
-    XDG_CACHE_HOME \
-    XDG_CONFIG_HOME \
-    XDG_DATA_HOME
+# gpg
+export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
+# ssh
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+
+if hash systemctl 2>/dev/null; then
+    systemctl --user import-environment \
+        XDG_CACHE_HOME \
+        XDG_CONFIG_HOME \
+        XDG_DATA_HOME \
+        GNUPGHOME \
+        SSH_AUTH_SOCK
+fi
 
 # vim stuff
 [[ -d "$XDG_CACHE_HOME/vim/backup" ]] || mkdir -p "$XDG_CACHE_HOME"/vim/{backup,undo,view}
@@ -17,9 +26,10 @@ export EDITOR=vim
 export VISUAL=vim
 
 # default browser
-export BROWSER=dwb
+export BROWSER=qutebrowser
 
 # mail
+export MAILDIR="$HOME/mail"
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch"
 
 # less
@@ -35,5 +45,11 @@ export TASKRC="$XDG_CONFIG_HOME/taskrc"
 export MPV_HOME="$XDG_CONFIG_HOME/mpv"
 export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer"
 
-# gpg
-export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
+# pass
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+
+# SSH Agent
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+
+# weechat
+export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"