From e5e981507fd85b8790cd478c38d01d9f7fd21c47 Mon Sep 17 00:00:00 2001
From: Alan Bradburne <abradburne@gmail.com>
Date: Wed, 16 Jul 2025 09:00:11 +0900
Subject: [PATCH] Additional keyservers (#180)

* Adds additional keyservers and faster timeout

* forgot to restart the dirmngr!

* remove openpgp since doesn't work for spotify, dropbox etc
---
 default/gpg/dirmngr.conf | 7 +++++++
 install/4-config.sh      | 7 +++++++
 migrations/1752535341.sh | 6 ++++++
 3 files changed, 20 insertions(+)
 create mode 100644 default/gpg/dirmngr.conf
 create mode 100644 migrations/1752535341.sh

diff --git a/default/gpg/dirmngr.conf b/default/gpg/dirmngr.conf
new file mode 100644
index 0000000..8d32790
--- /dev/null
+++ b/default/gpg/dirmngr.conf
@@ -0,0 +1,7 @@
+keyserver hkps://keyserver.ubuntu.com
+keyserver hkps://pgp.surfnet.nl
+keyserver hkps://keys.mailvelope.com
+keyserver hkps://keyring.debian.org
+keyserver hkps://pgp.mit.edu
+
+connect-quick-timeout 4
diff --git a/install/4-config.sh b/install/4-config.sh
index 69adf77..bfa6fa4 100644
--- a/install/4-config.sh
+++ b/install/4-config.sh
@@ -4,6 +4,13 @@ cp -R ~/.local/share/omarchy/config/* ~/.config/
 # Ensure application directory exists for update-desktop-database
 mkdir -p ~/.local/share/applications
 
+# Setup GPG configuration with multiple keyservers for better reliability
+sudo mkdir -p /etc/gnupg
+sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
+sudo chmod 644 /etc/gnupg/dirmngr.conf
+sudo gpgconf --kill dirmngr || true
+sudo gpgconf --launch dirmngr || true
+
 # Use default bashrc from Omarchy
 echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc
 
diff --git a/migrations/1752535341.sh b/migrations/1752535341.sh
new file mode 100644
index 0000000..9bf14fe
--- /dev/null
+++ b/migrations/1752535341.sh
@@ -0,0 +1,6 @@
+echo "Setting up GPG configuration with multiple keyservers for better reliability"
+sudo mkdir -p /etc/gnupg
+sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
+sudo chmod 644 /etc/gnupg/dirmngr.conf
+sudo gpgconf --kill dirmngr || true
+sudo gpgconf --launch dirmngr || true