fix: gpg socket agent path

Makefile

@@ -33,6 +33,8 @@ update-tools:
 credentials: \
 	$(CACHE_DIR)/secrets/credentials.tfvars
 
+# If using QubesOS, the smart card must be connected directly to the qube,
+# rather than using a 'vault' qube.
 .PHONY:
 shell: build-container
 	$(call run-container, -v ./secrets:/secrets)
@@ -136,9 +138,8 @@ GPG_TTY ?= $(shell tty)
 define run-container
 	docker run -it $(1) \
 		-e GPG_TTY="$(GPG_TTY)" \
-		-e GPG_AGENT_INFO=/S.gpg-agent:0:1 \
-		-v $(shell gpgconf --list-dirs agent-socket):/root/.gnupg-w/S.gpg-agent \
-		-v $(shell gpgconf --list-dirs homedir):/root/.gnupg:ro \
+		-v $(shell gpgconf --list-dirs agent-socket):/root/.gnupg/S.gpg-agent:ro \
+		-v $(shell gpgconf --list-dirs homedir):/root/.gnupg:rw \
 		git.distrust.co/public/stack-tools
 endef