diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el index f9a6422..d43f754 100644 --- a/doom/.config/doom/config.el +++ b/doom/.config/doom/config.el @@ -41,6 +41,11 @@ ;; doesn't show in childframe, but might be useful in terminal company-show-quick-access 1)) +;; pinentry for emacs ssh gpg +(use-package! pinentry + :init (setq epg-pinentry-mode `loopback) + (pinentry-start)) + ;; Whenever you reconfigure a package, make sure to wrap your config in an ;; `after!' block, otherwise Doom's defaults may override your settings. E.g. ;; diff --git a/doom/.config/doom/packages.el b/doom/.config/doom/packages.el index d530eae..401ebc8 100644 --- a/doom/.config/doom/packages.el +++ b/doom/.config/doom/packages.el @@ -52,3 +52,4 @@ (package! ghq :pin "582bd6daa505d04c7cc06d6c82ed8aee0624bfbe") (package! smudge :pin "9e3488f485b7d7f3c97ebaad34ed552bb0cc228a") (package! speed-type :pin "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21") +(package! pinentry) diff --git a/gnupg/.gnupg/gpg-agent.conf b/gnupg/.gnupg/gpg-agent.conf index 84c7c67..12e1655 100644 --- a/gnupg/.gnupg/gpg-agent.conf +++ b/gnupg/.gnupg/gpg-agent.conf @@ -4,3 +4,5 @@ default-cache-ttl 86400 max-cache-ttl 86400 # pinentry-program /usr/bin/pinentry-gnome3 # idk if this needs to be adjusted for macos +allow-emacs-pinentry +allow-loopback-pinentry diff --git a/zsh/.zshrc b/zsh/.zshrc index fb74597..5d0c7d4 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -71,9 +71,14 @@ if [[ "$HOST" == core.envs.net ]]; then fi # tycho (which is a laptop) -if [[ "$HOST" == tycho && -z "$DISPLAY" ]]; then +#if [[ "$HOST" == tycho && -z "$DISPLAY" ]]; then +# export GPG_TTY=$(tty) +#fi + +gpgtemp() { export GPG_TTY=$(tty) -fi + echo "remember to run gpgyeet once done..." +} # pash configuration export PASH_KEYID=BF66E5C8A1416E2A857C774CA343F43342EB6E2A @@ -100,6 +105,7 @@ pash() { # GPG: invalidate acahe gpgyeet() { echo RELOADAGENT | gpg-connect-agent + unset GPG_TTY } # emacs magit