From efd267df8505c0660376783323116d304115a1d8 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Sun, 31 May 2020 14:15:41 -0400 Subject: [PATCH 1/2] Removed old unused commands added a new one. --- zsh/zplug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zsh/zplug b/zsh/zplug index da91ef3..97523a2 100755 --- a/zsh/zplug +++ b/zsh/zplug @@ -5,7 +5,7 @@ source ${ZPLUG_HOME}/init.zsh zplug "${ZDIR}/modules/bin/", from:local, as:command, use:"*" zplug "junegunn/fzf-bin", from:gh-r, as:command, rename-to:fzf zplug "zdharma/zsh-diff-so-fancy", as:command, use:"bin/{git-dsf,diff-so-fancy}" -zplug "tstack/lnav", from:gh-r, as:command +zplug "bigH/git-fuzzy", as:command, use:"bin/git-fuzzy" zplug "${ZDIR}/modules/alias/", from:local, as:plugin zplug "${ZDIR}/modules/complete/", from:local, as:plugin @@ -15,7 +15,6 @@ zplug "${ZDIR}/modules/keybinds/", from:local, as:plugin zplug "hlissner/zsh-autopair", as:plugin, defer:2 zplug "junegunn/fzf", use:"shell/*.zsh", defer:2 zplug "mafredri/zsh-async", as:plugin, defer:2 -zplug "wfxr/forgit", as:plugin, defer:2 zplug "zdharma/fast-syntax-highlighting", as:plugin, defer:2 zplug "zsh-users/zsh-autosuggestions", as:plugin, defer:2 zplug "zsh-users/zsh-completions", as:plugin, defer:2 From 14c239d9f5ba02c373a39dd0f1cf5332efef763f Mon Sep 17 00:00:00 2001 From: James Patrick Date: Sun, 31 May 2020 18:30:47 -0400 Subject: [PATCH 2/2] Conditionally loading the bridge crt if it exist. --- emacs/config.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/emacs/config.el b/emacs/config.el index e9426fb..4cd3be7 100644 --- a/emacs/config.el +++ b/emacs/config.el @@ -50,7 +50,12 @@ message-send-mail-function 'smtpmail-send-it smtpmail-auth-credentials "~/.authinfo.gpg" smtpmail-smtp-server "127.0.0.1" smtpmail-smtp-service 1025) -(add-to-list 'gnutls-trustfiles "~/.config/mbsync/transient/bridge.crt") + +(let ((bridgecert (expand-file-name "~/.config/mbsync/transient/bridge.crt"))) + (when (file-exists-p bridgecert) + (add-to-list 'gnutls-trustfiles bridgecert) + ) + ) (defcustom mu4e-bookmarks '(( :name "Unread messages"