From 644785859ac960c0da64016065a800bf660ffbcf Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Fri, 17 Apr 2026 14:47:34 +0100 Subject: refactor: revert GNUPGHOME to default ~/.gnupg Drop custom GNUPGHOME=~/.local/share/gnupg which required 6 systemd socket/service overrides with hardcoded directory hashes. GnuPG periodically changes its hash algorithm on updates, silently breaking systemd socket activation and pam-gnupg passphrase presetting. With default GNUPGHOME, stock systemd units work out of the box. - Move gpg.conf, gpg-agent.conf, sshcontrol to home/.gnupg/ - Delete all gpg-agent socket/service/dirmngr override dirs - Remove GNUPGHOME from .zprofile, .pam_environment, pam-gnupg - Remove GNUPGHOME from vdirsyncer and bridge service overrides --- home/.config/pam-gnupg | 1 - home/.config/systemd/user/bridge.service.d/override.conf | 1 - home/.config/systemd/user/dirmngr.socket.d/override.conf | 3 --- home/.config/systemd/user/gpg-agent-browser.socket.d/override.conf | 3 --- home/.config/systemd/user/gpg-agent-extra.socket.d/override.conf | 3 --- home/.config/systemd/user/gpg-agent-ssh.socket.d/override.conf | 3 --- home/.config/systemd/user/gpg-agent.service.d/override.conf | 2 -- home/.config/systemd/user/gpg-agent.socket.d/override.conf | 3 --- home/.config/systemd/user/vdirsyncer.service.d/override.conf | 1 - home/.config/zsh/.zprofile | 1 - 10 files changed, 21 deletions(-) delete mode 100644 home/.config/systemd/user/dirmngr.socket.d/override.conf delete mode 100644 home/.config/systemd/user/gpg-agent-browser.socket.d/override.conf delete mode 100644 home/.config/systemd/user/gpg-agent-extra.socket.d/override.conf delete mode 100644 home/.config/systemd/user/gpg-agent-ssh.socket.d/override.conf delete mode 100644 home/.config/systemd/user/gpg-agent.service.d/override.conf delete mode 100644 home/.config/systemd/user/gpg-agent.socket.d/override.conf (limited to 'home/.config') diff --git a/home/.config/pam-gnupg b/home/.config/pam-gnupg index b6deeb6..9a6c85b 100644 --- a/home/.config/pam-gnupg +++ b/home/.config/pam-gnupg @@ -1,4 +1,3 @@ -~/.local/share/gnupg 5110851E65983C892CC09B51B17F50B3073C3F13 613F4BBF6E877E8CF55E18C24A429474B2F1A6AD 91191A4A6E86279A901A7D38A7512EC126518FA5 diff --git a/home/.config/systemd/user/bridge.service.d/override.conf b/home/.config/systemd/user/bridge.service.d/override.conf index 50c7feb..3938b3c 100644 --- a/home/.config/systemd/user/bridge.service.d/override.conf +++ b/home/.config/systemd/user/bridge.service.d/override.conf @@ -1,3 +1,2 @@ [Service] -Environment="GNUPGHOME=%h/.local/share/gnupg" Environment="PASSWORD_STORE_DIR=%h/.local/share/password-store" \ No newline at end of file diff --git a/home/.config/systemd/user/dirmngr.socket.d/override.conf b/home/.config/systemd/user/dirmngr.socket.d/override.conf deleted file mode 100644 index 95ac960..0000000 --- a/home/.config/systemd/user/dirmngr.socket.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Socket] -ListenStream= -ListenStream=%t/gnupg/d.hmaqciuk8y8ye3gwt9b6eth1/S.dirmngr \ No newline at end of file diff --git a/home/.config/systemd/user/gpg-agent-browser.socket.d/override.conf b/home/.config/systemd/user/gpg-agent-browser.socket.d/override.conf deleted file mode 100644 index 8c8e5c9..0000000 --- a/home/.config/systemd/user/gpg-agent-browser.socket.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Socket] -ListenStream= -ListenStream=%t/gnupg/d.199epr64wmzkrnk8u8qgricf/S.gpg-agent.browser \ No newline at end of file diff --git a/home/.config/systemd/user/gpg-agent-extra.socket.d/override.conf b/home/.config/systemd/user/gpg-agent-extra.socket.d/override.conf deleted file mode 100644 index de8e3cc..0000000 --- a/home/.config/systemd/user/gpg-agent-extra.socket.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Socket] -ListenStream= -ListenStream=%t/gnupg/d.199epr64wmzkrnk8u8qgricf/S.gpg-agent.extra \ No newline at end of file diff --git a/home/.config/systemd/user/gpg-agent-ssh.socket.d/override.conf b/home/.config/systemd/user/gpg-agent-ssh.socket.d/override.conf deleted file mode 100644 index b3934ed..0000000 --- a/home/.config/systemd/user/gpg-agent-ssh.socket.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Socket] -ListenStream= -ListenStream=%t/gnupg/d.199epr64wmzkrnk8u8qgricf/S.gpg-agent.ssh \ No newline at end of file diff --git a/home/.config/systemd/user/gpg-agent.service.d/override.conf b/home/.config/systemd/user/gpg-agent.service.d/override.conf deleted file mode 100644 index 3a220a3..0000000 --- a/home/.config/systemd/user/gpg-agent.service.d/override.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -Environment="GNUPGHOME=%h/.local/share/gnupg" \ No newline at end of file diff --git a/home/.config/systemd/user/gpg-agent.socket.d/override.conf b/home/.config/systemd/user/gpg-agent.socket.d/override.conf deleted file mode 100644 index 2794cfc..0000000 --- a/home/.config/systemd/user/gpg-agent.socket.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Socket] -ListenStream= -ListenStream=%t/gnupg/d.199epr64wmzkrnk8u8qgricf/S.gpg-agent \ No newline at end of file diff --git a/home/.config/systemd/user/vdirsyncer.service.d/override.conf b/home/.config/systemd/user/vdirsyncer.service.d/override.conf index 8cca0f8..6bc6060 100644 --- a/home/.config/systemd/user/vdirsyncer.service.d/override.conf +++ b/home/.config/systemd/user/vdirsyncer.service.d/override.conf @@ -1,3 +1,2 @@ [Service] -Environment="GNUPGHOME=%h/.local/share/gnupg" Environment="PASSWORD_STORE_DIR=%h/.local/share/password-store" diff --git a/home/.config/zsh/.zprofile b/home/.config/zsh/.zprofile index f02ee06..c1af85d 100644 --- a/home/.config/zsh/.zprofile +++ b/home/.config/zsh/.zprofile @@ -39,7 +39,6 @@ export LESS="-F --RAW-CONTROL-CHARS" [[ -r /usr/bin/source-highlight-esc.sh ]] && export LESSOPEN="| /usr/bin/source-highlight-esc.sh %s" # ── GPG / SSH ───────────────────────────────────────────────────────────────── -export GNUPGHOME="$XDG_DATA_HOME/gnupg" export GPG_TTY=$TTY unset SSH_AGENT_PID export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" -- cgit v1.2.3-70-g09d2