From 6e06d7049a7cb21382d4f054da0eba67ae8dbeba Mon Sep 17 00:00:00 2001
From: Christian Segundo
Date: Fri, 5 Jan 2024 14:56:06 +0100
Subject: fix gnupg config

---
 Makefile                              | 2 ++
 public/gpg/.gnupg-conf/gpg-agent.conf | 3 +++
 public/gpg/.gnupg-conf/gpg.conf       | 3 +++
 public/gpg/.gnupg/gpg-agent.conf      | 3 ---
 public/gpg/.gnupg/gpg.conf            | 3 ---
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 public/gpg/.gnupg-conf/gpg-agent.conf
 create mode 100644 public/gpg/.gnupg-conf/gpg.conf
 delete mode 100644 public/gpg/.gnupg/gpg-agent.conf
 delete mode 100644 public/gpg/.gnupg/gpg.conf

diff --git a/Makefile b/Makefile
index 95f3a52..6986f79 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ all: clean merge stow after_stow
 after_stow:
 	ln -nfs "$(PREFIX)/.nvim" "$(PREFIX)/.config/nvim"
 	ln -nfs "$(PREFIX)/.zls.json" "$(PREFIX)/Library/Application Support/zls.json"
+	ln -nfs "$(PREFIX)/.gnupg-conf/gpg-agent.conf" "$(PREFIX)/.gnupg/gpg-agent.conf"
+	ln -nfs "$(PREFIX)/.gnupg-conf/gpg.conf" "$(PREFIX)/.gnupg/gpg.conf"
 
 .PHONY: stow
 stow:
diff --git a/public/gpg/.gnupg-conf/gpg-agent.conf b/public/gpg/.gnupg-conf/gpg-agent.conf
new file mode 100644
index 0000000..ca08738
--- /dev/null
+++ b/public/gpg/.gnupg-conf/gpg-agent.conf
@@ -0,0 +1,3 @@
+default-cache-ttl 600
+max-cache-ttl 7200
+pinentry-program /opt/homebrew/bin/pinentry-mac
diff --git a/public/gpg/.gnupg-conf/gpg.conf b/public/gpg/.gnupg-conf/gpg.conf
new file mode 100644
index 0000000..ff4a19b
--- /dev/null
+++ b/public/gpg/.gnupg-conf/gpg.conf
@@ -0,0 +1,3 @@
+auto-key-retrieve
+no-emit-version
+default-key 5C33B928B8E5F18A1F23D9AB8B6B1A3CF906CCEC
diff --git a/public/gpg/.gnupg/gpg-agent.conf b/public/gpg/.gnupg/gpg-agent.conf
deleted file mode 100644
index ca08738..0000000
--- a/public/gpg/.gnupg/gpg-agent.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-default-cache-ttl 600
-max-cache-ttl 7200
-pinentry-program /opt/homebrew/bin/pinentry-mac
diff --git a/public/gpg/.gnupg/gpg.conf b/public/gpg/.gnupg/gpg.conf
deleted file mode 100644
index ff4a19b..0000000
--- a/public/gpg/.gnupg/gpg.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-auto-key-retrieve
-no-emit-version
-default-key 5C33B928B8E5F18A1F23D9AB8B6B1A3CF906CCEC
-- 
cgit v1.2.3