Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

neomutt: fix crypt_use_gpgme in newer versions

Browse source 
Fixes config load error since newer versions of neomutt don't allow
`crypt_use_gpgme` to be loaded dynamically (from folder hooks)
This commit is contained in:
arjan-s 2024-02-05 23:42:06 +01:00 committed by GitHub
parent 7b4ea8d82f
commit f65dcd6c15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/programs/neomutt.nix
View file

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

1
tests/modules/programs/neomutt/hm-example.com-expected
View file

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

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

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

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

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

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

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

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

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

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

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

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

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

1
tests/modules/programs/neomutt/neomutt-expected.conf
View file

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

1
tests/modules/programs/neomutt/neomutt-not-primary-expected.conf
View file

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

1
tests/modules/programs/neomutt/neomutt-with-binds-expected.conf
View file

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

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

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