From c29e7cb742d8c44954e9638c781cb01eef0cd2d3 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 11 Oct 2022 06:30:10 +0200
Subject: [PATCH] chore: move `~/.gnupg` to `~/.config/gnupg`

---
 .../private_gnupg/encrypted_private_sshcontrol.asc       | 9 +++++++++
 .../private_gnupg/private_gpg-agent.conf                 | 4 ++--
 .../private_gnupg}/private_gpg.conf                      | 0
 dot_config/zsh/dot_zshenv                                | 1 +
 private_dot_gnupg/encrypted_private_sshcontrol.asc       | 9 ---------
 5 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 dot_config/private_gnupg/encrypted_private_sshcontrol.asc
 rename private_dot_gnupg/private_gpg-agent.conf.tmpl => dot_config/private_gnupg/private_gpg-agent.conf (78%)
 rename {private_dot_gnupg => dot_config/private_gnupg}/private_gpg.conf (100%)
 delete mode 100644 private_dot_gnupg/encrypted_private_sshcontrol.asc

diff --git a/dot_config/private_gnupg/encrypted_private_sshcontrol.asc b/dot_config/private_gnupg/encrypted_private_sshcontrol.asc
new file mode 100644
index 0000000..6e7efde
--- /dev/null
+++ b/dot_config/private_gnupg/encrypted_private_sshcontrol.asc
@@ -0,0 +1,9 @@
+-----BEGIN PGP MESSAGE-----
+
+hF4Dt852JJsu9zQSAQdA5CyTl2xZuaf3hV6vQMaudEsBEpFUv5XwH6oovLTsuCEw
+9xDhIgR10qkywD1uxKZMdN/c9rqA7g2wBvwjkdITAsy5kWMykYGLh5Fe5tp7UVGZ
+0m0BbN3d++L0yytRC0NWq32FID2j7auueTdHMANHx02v40iXM/WPCNCJRFbY6Dl3
+XXF8w6LmlBJZMKfWEMslpB/1tEVySfeR4fkiLQjZwiGJIfRPOiYlOshKUWQYew1P
+5VGpt0gVmZMlfwgQCb3u
+=/Aag
+-----END PGP MESSAGE-----
diff --git a/private_dot_gnupg/private_gpg-agent.conf.tmpl b/dot_config/private_gnupg/private_gpg-agent.conf
similarity index 78%
rename from private_dot_gnupg/private_gpg-agent.conf.tmpl
rename to dot_config/private_gnupg/private_gpg-agent.conf
index 12e4d93..9e42bef 100644
--- a/private_dot_gnupg/private_gpg-agent.conf.tmpl
+++ b/dot_config/private_gnupg/private_gpg-agent.conf
@@ -3,6 +3,6 @@ default-cache-ttl 60
 max-cache-ttl 120
 default-cache-ttl-ssh 60
 max-cache-ttl-ssh 120
-{{ if eq .chezmoi.os "darwin" }}
+
 pinentry-program /opt/homebrew/bin/pinentry-mac
-{{ end }}
+
diff --git a/private_dot_gnupg/private_gpg.conf b/dot_config/private_gnupg/private_gpg.conf
similarity index 100%
rename from private_dot_gnupg/private_gpg.conf
rename to dot_config/private_gnupg/private_gpg.conf
diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv
index ec687a7..c6785ed 100644
--- a/dot_config/zsh/dot_zshenv
+++ b/dot_config/zsh/dot_zshenv
@@ -5,6 +5,7 @@ export EDITOR=nvim
 export HISTFILE=~/.config/zsh/history
 # don't write a less history
 export LESSHISTFILE=-
+export GNUPGHOME=~/.config/gnupg
 
 # check if .local/bin is directory, if not create it
 if [ ! -d "$HOME/.local/bin" ]; then
diff --git a/private_dot_gnupg/encrypted_private_sshcontrol.asc b/private_dot_gnupg/encrypted_private_sshcontrol.asc
deleted file mode 100644
index 9fd929a..0000000
--- a/private_dot_gnupg/encrypted_private_sshcontrol.asc
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PGP MESSAGE-----
-
-hF4Dt852JJsu9zQSAQdAinMDIj5T8qZNg5p8XNjDjZph3OZRUfSWd4vEYVQPIRUw
-4+qunbjT8S3d9LJHaTtPLgrc/Ky2If3IIGIIv5qiSqNG3Bebhh2SP7LUpO1au6ro
-0m0BbTx4S0oM6ShewCMo4EE5yNXlg3G6g4nRwN51jxuxjHpIj+jNTkIDGfb/iA5U
-ZCsF1461mdHdbfbwlshMaviawnSAs2Rbc0Jery+dQATIJhm+NdZbNiyudZwVCalW
-aE5pHWvZm8PE8psxy3VB
-=Imms
------END PGP MESSAGE-----