awesome: lock session with i3lock directly

[dotfiles.git] / zshenv

diff --git a/zshenv b/zshenv
index 349c93cabb4039efede80c360df148d5042e44fc..80665665389c087b1531a3358bbf49508d79f343 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -8,7 +8,9 @@ export HOST=$(hostname)
 # gpg
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
 # ssh
-export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+export SSH_AUTH_SOCK=${SSH_AUTH_SOCK:-"$XDG_RUNTIME_DIR/ssh-agent.socket"}
+
+export MAILDIR="$HOME/mail"
 
 if hash systemctl 2>/dev/null; then
     systemctl --user import-environment \
@@ -16,6 +18,7 @@ if hash systemctl 2>/dev/null; then
         XDG_CONFIG_HOME \
         XDG_DATA_HOME \
         GNUPGHOME \
+        MAILDIR \
         SSH_AUTH_SOCK
 fi
 
@@ -29,7 +32,6 @@ export VISUAL=vim
 export BROWSER=qutebrowser
 
 # mail
-export MAILDIR="$HOME/mail"
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch"
 
 # less
@@ -48,10 +50,15 @@ export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer"
 # 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"
 
-export MAKEFLAGS="-j$(nproc --all --ignore=2)"
+case "$OSTYPE" in
+    linux*)  export MAKEFLAGS="-j$(nproc --all --ignore=2)" ;;
+    darwin*) export MAKEFLAGS="-j$(($(sysctl -n hw.ncpu) - 2))" ;;
+    *)       echo "Unknown OSTYPE: '$OSTYPE'"
+esac
+
+export CTEST_OUTPUT_ON_FAILURE=1
+
+export WORKSPACE=~/src/fpp/