From 071869cb6ceb063fc3d2528cfd90b93e09042437 Mon Sep 17 00:00:00 2001 From: josiah Date: Thu, 14 Sep 2023 14:49:24 -0500 Subject: [PATCH] Minor changes. --- .bashrc | 16 ++++++++-------- .emacs.d/custom.el | 7 ++----- .gnupg/gpg-agent.conf | 17 ++++++++++++----- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.bashrc b/.bashrc index 1f15e91..8ac12be 100644 --- a/.bashrc +++ b/.bashrc @@ -71,16 +71,16 @@ fi # handle key management through `keychain` because its great ## first set up gpg agent -[ -f ~/.gpg-agent-info ] && source ~/.gpg-agent-info -if [ -S "${GPG_AGENT_INFO%%:*}" ]; then - export GPG_AGENT_INFO -else - eval $( gpg-agent --daemon ) -fi +# [ -f ~/.gpg-agent-info ] && source ~/.gpg-agent-info +# if [ -S "${GPG_AGENT_INFO%%:*}" ]; then +# export GPG_AGENT_INFO +# else +# eval $( gpg-agent --daemon ) +# fi ## then configure keychain -eval $(keychain --eval --quiet ~/.ssh/{awful-git,github,digitalocean,home-net}) -eval $(keychain --gpg2 --agents gpg) +eval $(keychain --eval ~/.ssh/{awful-git,github,digitalocean,home-net}) +eval $(keychain --agents gpg) # host specific configurations: if [[ $(shopt login_shell | cut -f2) == "on" ]] diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index b6ea90d..f9daa82 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -12,11 +12,9 @@ '(epg-gpg-program "/usr/local/bin/gpg") '(global-hl-line-mode t) '(org-agenda-files - '("/home/josiah/dhd/org/big-bend-notes.org" "/home/josiah/dhd/org/documentation.org" "/home/josiah/dhd/org/finances.org" "/home/josiah/dhd/org/fitness.org" "/home/josiah/dhd/org/housing.org" "/home/josiah/dhd/org/hoyden.org" "/home/josiah/dhd/org/interview-notes.org" "/home/josiah/dhd/org/jlj-template.org" "/home/josiah/dhd/org/pagedout.org" "/home/josiah/dhd/org/pagedout2.org" "/home/josiah/dhd/org/personal.org" "/home/josiah/dhd/org/refile-beorg.org" "/home/josiah/dhd/org/someday.org" "/home/josiah/dhd/org/stjohns-trello.org" "/home/josiah/dhd/org/stjohns.org" "/home/josiah/dhd/org/vehicles.org" "/home/josiah/dhd/org/webwiki.org" "/home/josiah/dhd/org/work.org")) - '(org-trello-current-prefix-keybinding "C-c o" nil (org-trello)) - '(org-trello-files '("~/dhd/org/stjohns-trello.org") nil (org-trello)) + '("/home/josiah/dhd/org/documentation.org" "/home/josiah/dhd/org/finances.org" "/home/josiah/dhd/org/jlj-template.org" "/home/josiah/dhd/org/personal.org" "/home/josiah/dhd/org/webwiki.org" "/home/josiah/dhd/org/work.org")) '(package-selected-packages - '(mu4e org-trello python-black rust-mode company lsp-mode nix-mode markdown-mode flycheck s lsp-pyright ido-vertical-mode dash-functional region-bindings-mode jinja2-mode dockerfile-mode sudo-edit modus-themes org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)) + '(py-isort terraform-mode mu4e org-trello python-black rust-mode company lsp-mode nix-mode markdown-mode flycheck s lsp-pyright ido-vertical-mode dash-functional region-bindings-mode jinja2-mode dockerfile-mode sudo-edit modus-themes org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)) '(request-backend 'url-retrieve)) '(znc-servers `(("bouncer.awful.club" 5000 t @@ -28,5 +26,4 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. ) - ;;; custom.el ends here diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index 2f7b047..40e552f 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -1,6 +1,13 @@ default-cache-ttl 31536000 -max-cache-ttl 31536000 -log-file /var/log/gpg-agent -debug-level basic -pinentry-program /run/current-system/sw/bin/pinentry -#use-agent # commented this out. I did a system upgrade and this argument became inactive. +max-cache-ttl 7200 +debug ipc +debug-level guru +no-grab +debug 1024 +verbose +verbose +verbose +enable-ssh-support +debug-pinentry +log-file /home/josiah/.gnupg/test.log +pinentry-program /run/current-system/sw/bin/pinentry-curses