summary refs log tree commit diff stats
path: root/zsh
diff options
context:
space:
mode:
authorAlan Pearce2017-08-31 18:24:43 +0200
committerAlan Pearce2017-08-31 18:24:43 +0200
commit6045fa207e8844b7b91cf56f2349094c29fd7719 (patch)
treecfe7b1b33277fedd86aa5010bcf92dbd1739631b /zsh
parent46a28c0496d4d8422056011556bde12e759ff6d1 (diff)
parent508479288c0843099d8f11da65a62e3d20950af8 (diff)
downloaddotfiles-6045fa207e8844b7b91cf56f2349094c29fd7719.tar.lz
dotfiles-6045fa207e8844b7b91cf56f2349094c29fd7719.tar.zst
dotfiles-6045fa207e8844b7b91cf56f2349094c29fd7719.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'zsh')
-rw-r--r--zsh/.config/zsh/.zshenv17
1 files changed, 11 insertions, 6 deletions
diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
index 4f7b20f..dc84f1d 100644
--- a/zsh/.config/zsh/.zshenv
+++ b/zsh/.config/zsh/.zshenv
@@ -10,12 +10,6 @@ then
     . $ZDOTDIR/zshenv.private
   fi
 
-  unset SSH_AGENT_PID
-  if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]
-  then
-    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
-  fi
-
   if [[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]]
   then
     . $HOME/.nix-profile/etc/profile.d/nix.sh;
@@ -47,6 +41,15 @@ then
     fi
   fi
 
+  if [[ $os != "darwin" ]]
+  then
+    unset SSH_AGENT_PID
+    if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]
+    then
+      export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+    fi
+  fi
+
   case $MACHTYPE in
     *64)
       arch=amd64
@@ -70,4 +73,6 @@ then
   export GTAGSLABEL=ctags
 
   export GHQ_ROOT="$HOME/projects:$HOME/go/src"
+
+  export LEDGER_FILE="$HOME/Sync/Default/ledger/my.ledger"
 fi