From 4c87dfe07a8ac32e053b95d71dd6cd9f53d57803 Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Mon, 29 May 2017 10:44:19 +0800
Subject: gpg.conf: Enable "with-keygrip" and change keyserver

---
 _gnupg/gpg.conf | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/_gnupg/gpg.conf b/_gnupg/gpg.conf
index 258c10e..1191b5f 100644
--- a/_gnupg/gpg.conf
+++ b/_gnupg/gpg.conf
@@ -1,20 +1,20 @@
-#####################################################################
-# GnuPG configuration file
+#
 # ~/.gnupg/gpg.conf
+# GnuPG configuration file
 #
-# Based on Github: ioerror/duraconf's configuration:
-# https://github.com/ioerror/duraconf/blob/master/configs/gnupg/gpg.conf
 #
 # Reference:
-# [1] Riseup: OpenPGP Best Practices
+# [1] Github: ioerror/duraconf
+#     https://github.com/ioerror/duraconf/blob/master/configs/gnupg/gpg.conf
+# [2] Riseup: OpenPGP Best Practices
 #     https://help.riseup.net/en/gpg-best-practices
-# [2] Secure GnuPG configuration
+# [3] Secure GnuPG configuration
 #     http://sparkslinux.wordpress.com/2013/07/09/secure-gnupg-configuration
 #
-# Weitian LI <liweitianux@gmail.com>
-# Created: 2014/06/12
-# Updated: 2015/08/19
-#####################################################################
+# Aaron LI <aly@aaronly.me>
+# 2014-06-12
+# Updated: 2017-05-26
+#
 
 #-----------------------------
 # default key
@@ -54,6 +54,10 @@ keyid-format 0xlong
 # List all keys (or the specified ones) along with their fingerprints
 with-fingerprint
 
+# Also list the "keygrip", which is the ID used by `gpg-agent`.
+# (GnuPG >=2.1)
+with-keygrip
+
 # Display the calculated validity of user IDs during key listings
 list-options show-uid-validity
 verify-options show-uid-validity
@@ -68,8 +72,8 @@ use-agent
 
 # This is the server that --recv-keys, --send-keys, and --search-keys will
 # communicate with to receive keys from, send keys to, and search for keys on
-#keyserver hkp://pool.sks-keyservers.net
-keyserver hkps://hkps.pool.sks-keyservers.net
+keyserver hkp://pool.sks-keyservers.net
+#keyserver hkps://hkps.pool.sks-keyservers.net
 
 # Provide a certificate store to override the system default
 # Get this from https://sks-keyservers.net/sks-keyservers.netCA.pem
-- 
cgit v1.2.2