Merge remote-tracking branch 'origin/master'
3 files changed, 31 insertions(+), 30 deletions(-)
M emacs/.emacs.d/main.el → 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" +(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" + 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" + message-send-mail-function #'message-send-mail-with-sendmail + sendmail-program "msmtp" mu4e-maildir-shortcuts '(("/INBOX" . ?i)) mu4e-contexts
D ssh/.ssh/rc
@@ -1,5 +0,0 @@ -#!/bin/sh -if [ "$SSH_AUTH_SOCK" ] -then - ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock -fi
M zsh/.config/zsh/.zshenv → 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 @@ umask 002 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 @@ export GTAGSCONF=~/.globalrc export GTAGSLABEL=ctags export GHQ_ROOT="$HOME/projects:$HOME/go/src" + + export LEDGER_FILE="$HOME/Sync/Default/ledger/my.ledger" fi