myconfig

commit 92ce0fb1aec5941c5fa3ff5dce9bc0d8ea0f4140
parent c211e2639cd796bade87b2b83b2763dd92679ac4
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Thu, 25 Jan 2018 09:00:30 +0100

Merge branch 'master' of a3nm.net:git/myconfig

Diffstat:
gnupg/dirmngr.conf
 | 
9
++++++++-
gnupg/gpg.conf
 | 
4
++--
gnupg/sks-keyservers.netCA.pem
 | 
32
--------------------------------
mutt/fix_998
 | 
6
++++++
mutt/muttrc
 | 
2
++

5 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/gnupg/dirmngr.conf b/gnupg/dirmngr.conf
@@ -1 +1,8 @@
-hkp-cacert ~/config/sks-keyservers.netCA.pem
+# hkp-cacert ~/config/sks-keyservers.netCA.pem
+
+###+++--- GPGConf ---+++###
+use-tor
+###+++--- GPGConf ---+++### Sun 09 Oct 2016 10:49:44 PM CEST
+# GPGConf edited this configuration file.
+# It will disable options before this marked block, but it will
+# never change anything below these lines.
diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf
@@ -18,8 +18,8 @@ keyserver-options no-honor-keyserver-url
 # with gpg2, use dirmngr.conf
 # ca-cert-file=~/config/gnupg/sks-keyservers.netCA.pem
 # keyserver hkps://hkps.pool.sks-keyservers.net
-keyserver hkps://hkps.pool.sks-keyservers.net
-keyserver-options auto-key-retrieve
+# keyserver hkps://hkps.pool.sks-keyservers.net
+# keyserver-options hkp-cacert=/home/a3nm/config/gnupg/sks-keyservers.netCA.pem
 fixed-list-mode
 keyid-format 0xlong
 with-fingerprint
diff --git a/gnupg/sks-keyservers.netCA.pem b/gnupg/sks-keyservers.netCA.pem
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFizCCA3OgAwIBAgIJAK9zyLTPn4CPMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV
-BAYTAk5PMQ0wCwYDVQQIDARPc2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5u
-ZXQgQ0ExHjAcBgNVBAMMFXNrcy1rZXlzZXJ2ZXJzLm5ldCBDQTAeFw0xMjEwMDkw
-MDMzMzdaFw0yMjEwMDcwMDMzMzdaMFwxCzAJBgNVBAYTAk5PMQ0wCwYDVQQIDARP
-c2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5uZXQgQ0ExHjAcBgNVBAMMFXNr
-cy1rZXlzZXJ2ZXJzLm5ldCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBANdsWy4PXWNUCkS3L//nrd0GqN3dVwoBGZ6w94Tw2jPDPifegwxQozFXkG6I
-6A4TK1CJLXPvfz0UP0aBYyPmTNadDinaB9T4jIwd4rnxl+59GiEmqkN3IfPsv5Jj
-MkKUmJnvOT0DEVlEaO1UZIwx5WpfprB3mR81/qm4XkAgmYrmgnLXd/pJDAMk7y1F
-45b5zWofiD5l677lplcIPRbFhpJ6kDTODXh/XEdtF71EAeaOdEGOvyGDmCO0GWqS
-FDkMMPTlieLA/0rgFTcz4xwUYj/cD5e0ZBuSkYsYFAU3hd1cGfBue0cPZaQH2HYx
-Qk4zXD8S3F4690fRhr+tki5gyG6JDR67aKp3BIGLqm7f45WkX1hYp+YXywmEziM4
-aSbGYhx8hoFGfq9UcfPEvp2aoc8u5sdqjDslhyUzM1v3m3ZGbhwEOnVjljY6JJLx
-MxagxnZZSAY424ZZ3t71E/Mn27dm2w+xFRuoy8JEjv1d+BT3eChM5KaNwrj0IO/y
-u8kFIgWYA1vZ/15qMT+tyJTfyrNVV/7Df7TNeWyNqjJ5rBmt0M6NpHG7CrUSkBy9
-p8JhimgjP5r0FlEkgg+lyD+V79H98gQfVgP3pbJICz0SpBQf2F/2tyS4rLm+49rP
-fcOajiXEuyhpcmzgusAj/1FjrtlynH1r9mnNaX4e+rLWzvU5AgMBAAGjUDBOMB0G
-A1UdDgQWBBTkwyoJFGfYTVISTpM8E+igjdq28zAfBgNVHSMEGDAWgBTkwyoJFGfY
-TVISTpM8E+igjdq28zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAR
-OXnYwu3g1ZjHyley3fZI5aLPsaE17cOImVTehC8DcIphm2HOMR/hYTTL+V0G4P+u
-gH+6xeRLKSHMHZTtSBIa6GDL03434y9CBuwGvAFCMU2GV8w92/Z7apkAhdLToZA/
-X/iWP2jeaVJhxgEcH8uPrnSlqoPBcKC9PrgUzQYfSZJkLmB+3jEa3HKruy1abJP5
-gAdQvwvcPpvYRnIzUc9fZODsVmlHVFBCl2dlu/iHh2h4GmL4Da2rRkUMlbVTdioB
-UYIvMycdOkpH5wJftzw7cpjsudGas0PARDXCFfGyKhwBRFY7Xp7lbjtU5Rz0Gc04
-lPrhDf0pFE98Aw4jJRpFeWMjpXUEaG1cq7D641RpgcMfPFvOHY47rvDTS7XJOaUT
-BwRjmDt896s6vMDcaG/uXJbQjuzmmx3W2Idyh3s5SI0GTHb0IwMKYb4eBUIpQOnB
-cE77VnCYqKvN1NVYAqhWjXbY7XasZvszCRcOG+W3FqNaHOK/n/0ueb0uijdLan+U
-f4p1bjbAox8eAOQS/8a3bzkJzdyBNUKGx1BIK2IBL9bn/HravSDOiNRSnZ/R3l9G
-ZauX0tu7IIDlRCILXSyeazu0aj/vdT3YFQXPcvt5Fkf5wiNTo53f72/jYEJd6qph
-WrpoKqrwGwTpRUCMhYIUt65hsTxCiJJ5nKe39h46sg==
------END CERTIFICATE-----
diff --git a/mutt/fix_998 b/mutt/fix_998
@@ -0,0 +1,6 @@
+# fix for https://github.com/neomutt/neomutt/issues/998
+
+set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --textmode --armor --always-trust --encrypt -- --recipient %r -- %f"
+
+set pgp_encrypt_sign_command="/usr/lib/neomutt/pgpewrap gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - %?a?--local-user %a? --armor --always-trust --sign --encrypt -- --recipient %r -- %f"
+
diff --git a/mutt/muttrc b/mutt/muttrc
@@ -26,6 +26,8 @@ set crypt_autosmime=no
 set crypt_opportunistic_encrypt
 message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
 
+source ~/config/mutt/fix_998
+
 # == Personal stuff ==
 # undo the effect of some hooks
 send-hook . "unmy_hdr From:"