DELETED gnupg/gpg.conf
Index: gnupg/gpg.conf
==================================================================
--- gnupg/gpg.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-personal-cipher-preferences AES256 TWOFISH CAMELLIA256 CAMELLIA192 AES192 CAMELLIA128 AES
-personal-digest-preferences SHA512 SHA384 SHA256 SHA224 RIPEMD160
-personal-compress-preferences BZIP2 ZLIB ZIP Uncompressed
-digest-algo SHA512
-cipher-algo TWOFISH
-cert-digest-algo SHA512
-s2k-cipher-algo TWOFISH
-s2k-digest-algo SHA512
-default-preference-list AES256 TWOFISH CAMELLIA256 CAMELLIA192 AES192 CAMELLIA128 AES SHA512 SHA384 SHA256 SHA224 RIPEMD160 BZIP2 ZLIB ZIP Uncompressed
-disable-cipher-algo IDEA 3DES CAST5
-disable-pubkey-algo DSA ECDH ECDSA
-ask-cert-level
-default-key 6D1EC2269BC0B5459C8BA920CFDAB41F8292CEEE
-hidden-encrypt-to 6D1EC2269BC0B5459C8BA920CFDAB41F8292CEEE
-keyserver hkp://subset.pool.sks-keyservers.net

Index: gnupg/ownertrust
==================================================================
--- gnupg/ownertrust
+++ gnupg/ownertrust
@@ -1,3 +1,2 @@
+DC43171B6BE93978D09AD8B2C601EE21773E7C8F:6:
 6D1EC2269BC0B5459C8BA920CFDAB41F8292CEEE:6:
-0CC6AC541C7ADC733C641610636703577395312F:6:
-632E2A4DBFE3F3435A2F21BF94296EF2EC9BE683:6:

DELETED gnupg/scdaemon.conf
Index: gnupg/scdaemon.conf
==================================================================
--- gnupg/scdaemon.conf
+++ /dev/null
@@ -1,1 +0,0 @@
-disable-ccid

Index: setup.sh
==================================================================
--- setup.sh
+++ setup.sh
@@ -34,11 +34,11 @@
 		gpg="gpg"
 	else
 		gpg="false"
 	fi
 
-	gpg_key="EC9BE683"
+	gpg_key="DC43171B6BE93978D09AD8B2C601EE21773E7C8F"
 	if $gpg --list-secret-keys $gpg_key >/dev/null 2>&1; then
 		fossil set --global pgp-command \
 			"$gpg -u $gpg_key --clearsign -o"
 		fossil set --global clearsign 1
 	else
@@ -48,12 +48,10 @@
 fi
 have git && link_file git .config/git ../
 if have gpg || have gpg2; then
 	mkdir -p $HOME/.local/share/gnupg
 	chmod 700 $HOME/.local/share/gnupg
-	link_file gnupg/gpg.conf .local/share/gnupg/gpg.conf ../../../
-	link_file gnupg/scdaemon.conf .local/share/gnupg/scdaemon.conf ../../../
 	if have gpg2; then
 		gpg="gpg2"
 	else
 		gpg="gpg"
 	fi