neomutt: fix crypt_use_gpgme in newer versions

Fixes config load error since newer versions of neomutt don't allow
`crypt_use_gpgme` to be loaded dynamically (from folder hooks)

modules/programs/neomutt.nix

@@ -224,7 +224,6 @@ let
       set certificate_file=${toString config.accounts.email.certificatesFile}
 
       # GPG section
-      set crypt_use_gpgme = yes
       set crypt_autosign = ${lib.hm.booleans.yesNo (gpg.signByDefault or false)}
       set crypt_opportunistic_encrypt = ${
         lib.hm.booleans.yesNo (gpg.encryptByDefault or false)
@@ -351,6 +350,7 @@ in {
         set message_cachedir = "${config.xdg.cacheHome}/neomutt/messages/"
         set editor = "${cfg.editor}"
         set implicit_autoview = yes
+        set crypt_use_gpgme = yes
 
         alternative_order text/enriched text/plain text
 

tests/modules/programs/neomutt/hm-example.com-expected

@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes

tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf

@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = yes
 set crypt_opportunistic_encrypt = yes
 set pgp_use_gpg_agent = yes

tests/modules/programs/neomutt/hm-example.com-msmtp-expected.conf

@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes

tests/modules/programs/neomutt/hm-example.com-no-folder-change-expected.conf

@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes

tests/modules/programs/neomutt/hm-example.com-signature-command-expected

@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes

tests/modules/programs/neomutt/hm-example.com-signature-expected

@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes

tests/modules/programs/neomutt/hm-example.com-starttls-expected

@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes

tests/modules/programs/neomutt/neomutt-expected.conf

@@ -3,6 +3,7 @@ set header_cache = "/home/hm-user/.cache/neomutt/headers/"
 set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
+set crypt_use_gpgme = yes
 
 alternative_order text/enriched text/plain text
 

tests/modules/programs/neomutt/neomutt-not-primary-expected.conf

@@ -3,6 +3,7 @@ set header_cache = "/home/hm-user/.cache/neomutt/headers/"
 set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
+set crypt_use_gpgme = yes
 
 alternative_order text/enriched text/plain text
 

tests/modules/programs/neomutt/neomutt-with-binds-expected.conf

@@ -3,6 +3,7 @@ set header_cache = "/home/hm-user/.cache/neomutt/headers/"
 set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
+set crypt_use_gpgme = yes
 
 alternative_order text/enriched text/plain text
 

tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf

@@ -3,6 +3,7 @@ set header_cache = "/home/hm-user/.cache/neomutt/headers/"
 set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
+set crypt_use_gpgme = yes
 
 alternative_order text/enriched text/plain text