Merge remote-tracking branch 'origin/master'

This commit is contained in:
James Patrick 2020-06-01 10:41:27 -04:00
commit 95c3c08bd5
2 changed files with 7 additions and 3 deletions

View File

@ -50,7 +50,12 @@ message-send-mail-function 'smtpmail-send-it
smtpmail-auth-credentials "~/.authinfo.gpg" smtpmail-auth-credentials "~/.authinfo.gpg"
smtpmail-smtp-server "127.0.0.1" smtpmail-smtp-server "127.0.0.1"
smtpmail-smtp-service 1025) 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 (defcustom mu4e-bookmarks
'(( :name "Unread messages" '(( :name "Unread messages"

View File

@ -5,7 +5,7 @@ source ${ZPLUG_HOME}/init.zsh
zplug "${ZDIR}/modules/bin/", from:local, as:command, use:"*" zplug "${ZDIR}/modules/bin/", from:local, as:command, use:"*"
zplug "junegunn/fzf-bin", from:gh-r, as:command, rename-to:fzf 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 "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/alias/", from:local, as:plugin
zplug "${ZDIR}/modules/complete/", 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 "hlissner/zsh-autopair", as:plugin, defer:2
zplug "junegunn/fzf", use:"shell/*.zsh", defer:2 zplug "junegunn/fzf", use:"shell/*.zsh", defer:2
zplug "mafredri/zsh-async", as:plugin, 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 "zdharma/fast-syntax-highlighting", as:plugin, defer:2
zplug "zsh-users/zsh-autosuggestions", as:plugin, defer:2 zplug "zsh-users/zsh-autosuggestions", as:plugin, defer:2
zplug "zsh-users/zsh-completions", as:plugin, defer:2 zplug "zsh-users/zsh-completions", as:plugin, defer:2