Merge remote-tracking branch 'origin/master'

3 files changed, 33 insertions, 32 deletions

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index e50fdad5..e79c6055 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -1368,27 +1368,28 @@
 ;; *** mu
 
 ;; #+BEGIN_SRC emacs-lisp
-(add-to-list 'load-path (expand-file-name
-                         "../share/emacs/site-lisp/mu4e"
-                         (f-dirname
-                          (file-truename
-                           (executable-find "mu")))))
-(use-package mu4e
-  :config
-  (setq mu4e-use-fancy-chars nil
-        mu4e-attachment-dir "~/Downloads/"
-        mu4e-view-show-images t
-        mu4e-headers-date-format "%Y-%m-%d %H:%M"
-
-        mu4e-mu-home (expand-file-name "~/.cache/mu/alanpearce.eu")
-        mu4e-maildir (expand-file-name "~/mail/personal/alanpearce/")
-        mu4e-sent-folder "/Sent"
-        mu4e-drafts-folder "/Drafts"
-        mu4e-refile-folder "/Archive"
-        mu4e-trash-folder "/Trash"
-
-        message-send-mail-function #'message-send-mail-with-sendmail
-        sendmail-program "msmtp"
+(when (executable-find "mu")
+  (add-to-list 'load-path (expand-file-name
+                           "../share/emacs/site-lisp/mu4e"
+                           (f-dirname
+                            (file-truename
+                             (executable-find "mu")))))
+  (use-package mu4e
+    :config
+    (setq mu4e-use-fancy-chars nil
+          mu4e-attachment-dir "~/Downloads/"
+          mu4e-view-show-images t
+          mu4e-headers-date-format "%Y-%m-%d %H:%M"
+
+          mu4e-mu-home (expand-file-name "~/.cache/mu/alanpearce.eu")
+          mu4e-maildir (expand-file-name "~/mail/personal/alanpearce/")
+          mu4e-sent-folder "/Sent"
+          mu4e-drafts-folder "/Drafts"
+          mu4e-refile-folder "/Archive"
+          mu4e-trash-folder "/Trash"
+
+          message-send-mail-function #'message-send-mail-with-sendmail
+          sendmail-program "msmtp"
 
         mu4e-maildir-shortcuts '(("/INBOX" . ?i))
         mu4e-contexts
diff --git a/ssh/.ssh/rc b/ssh/.ssh/rc
deleted file mode 100755
index 59e4cfd1..00000000
--- a/ssh/.ssh/rc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-if [ "$SSH_AUTH_SOCK" ]
-then
-  ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
-fi
diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
index 4f7b20f7..dc84f1d9 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