[WIP] Push all of the ultrahaptics changes!

[dotfiles.git] / zshenv

diff --git a/zshenv b/zshenv
index 710e9f661d0ffb68ff1443149c47c27558c8409b..c4e0c843d69341b14420922cb3f1a101ba9cac48 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -5,19 +5,25 @@ export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CACHE_HOME="$HOME/.cache"
 export HOST=$(hostname)
 
 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"
+
+if hash systemctl 2>/dev/null; then
+    systemctl --user import-environment \
+        XDG_CACHE_HOME \
+        XDG_CONFIG_HOME \
+        XDG_DATA_HOME \
+        GNUPGHOME
+fi

 
 # vim stuff
 
 # vim stuff

-[[ -d "$XDG_CACHE_HOME/vim" ]] || mkdir -p "$XDG_CACHE_HOME/vim"
+[[ -d "$XDG_CACHE_HOME/vim/backup" ]] || mkdir -p "$XDG_CACHE_HOME"/vim/{backup,undo,view}

 export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
 export EDITOR=vim
 export VISUAL=vim
 
 # default browser
 export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
 export EDITOR=vim
 export VISUAL=vim
 
 # default browser

-export BROWSER=dwb
+export BROWSER=qutebrowser

 
 # mail
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch"
 
 # mail
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch"


@@ -35,5 +41,16 @@ export TASKRC="$XDG_CONFIG_HOME/taskrc"
 export MPV_HOME="$XDG_CONFIG_HOME/mpv"
 export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer"
 
 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"
+
+# HiDPI support for Qt applications
+# export QT_AUTO_SCREEN_SCALE_FACTOR=1
+
+# SSH Agent
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+
+# weechat
+export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
+
+export MAKEFLAGS="-j$(nproc --all --ignore=2)"