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

neomutt: remove empty lines (#6523)

Browse source 
* neomutt: remove empty lines

prettier + more readable
made some tests easier to update by printing full path
This commit is contained in:
Matthieu Coudron 2025-03-24 22:18:52 +01:00 • committed by GitHub
parent 2d057cd9d4
commit c4d5d72805
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 82 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,10 +13,6 @@ set sort = "threads"
set smtp_pass="`password-command`"
set smtp_url='smtps://home.manager@smtp.example.com'
# MRA section
set folder='/home/hm-user/Mail/hm@example.com'
set from='hm@example.com'
@ -32,6 +28,7 @@ color status cyan default
unset signature
# notmuch section
set nm_default_uri = "notmuch:///home/hm-user/Mail"
virtual-mailboxes "My INBOX" "notmuch://?query=tag%3Ainbox"

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

@ -13,10 +13,6 @@ set sort = "threads"
set smtp_pass="`password-command`"
set smtp_url='smtps://home.manager@smtp.example.com'
# MRA section
set folder='/home/hm-user/Mail/hm@example.com'
set from='hm@example.com'

4
tests/modules/programs/neomutt/hm-example.com-imap-expected.conf
View file

@ -13,10 +13,6 @@ set sort = "threads"
set smtp_pass="`password-command`"
set smtp_url='smtps://home.manager@smtp.example.com'
# MRA section
set folder='imaps://home.manager@imap.example.com:993'
set from='hm@example.com'

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

@ -12,10 +12,6 @@ set sort = "threads"
# MTA section
set sendmail='msmtpq --read-envelope-from --read-recipients'
# MRA section
set folder='/home/hm-user/Mail/hm@example.com'
set from='hm@example.com'

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

@ -12,10 +12,6 @@ set sort = "threads"
# MTA section
set sendmail='msmtpq --read-envelope-from --read-recipients'
# MRA section
set from='hm@example.com'
set postponed='+Drafts'

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

@ -13,10 +13,6 @@ set sort = "threads"
set smtp_pass="`password-command`"
set smtp_url='smtps://home.manager@smtp.example.com'
# MRA section
set folder='/home/hm-user/Mail/hm@example.com'
set from='hm@example.com'
@ -32,6 +28,7 @@ color status cyan default
set signature = "/nix/store/00000000000000000000000000000000-signature|"
# notmuch section
set nm_default_uri = "notmuch:///home/hm-user/Mail"
virtual-mailboxes "My INBOX" "notmuch://?query=tag%3Ainbox"

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

@ -13,10 +13,6 @@ set sort = "threads"
set smtp_pass="`password-command`"
set smtp_url='smtps://home.manager@smtp.example.com'
# MRA section
set folder='/home/hm-user/Mail/hm@example.com'
set from='hm@example.com'
@ -32,6 +28,7 @@ color status cyan default
set signature = /nix/store/00000000000000000000000000000000-signature.txt
# notmuch section
set nm_default_uri = "notmuch:///home/hm-user/Mail"
virtual-mailboxes "My INBOX" "notmuch://?query=tag%3Ainbox"

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

@ -13,10 +13,6 @@ set sort = "threads"
set smtp_pass="`password-command`"
set smtp_url='smtp://home.manager@smtp.example.com'
# MRA section
set folder='/home/hm-user/Mail/hm@example.com'
set from='hm@example.com'
@ -32,6 +28,7 @@ color status cyan default
unset signature
# notmuch section
set nm_default_uri = "notmuch:///home/hm-user/Mail"
virtual-mailboxes "My INBOX" "notmuch://?query=tag%3Ainbox"

4
tests/modules/programs/neomutt/hm-example.com-unmailboxes-expected.conf
View file

@ -14,10 +14,6 @@ set sort = "threads"
# MTA section
set sendmail='msmtpq --read-envelope-from --read-recipients'
# MRA section
set folder='/home/hm-user/Mail/hm@example.com'
set from='hm@example.com'

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

@ -4,31 +4,22 @@ 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
set delete = yes
# Binds
# Macros
# Register accounts
# register account hm@example.com
## register account hm@example.com
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
folder-hook /home/hm-user/Mail/hm@example.com/ " \
source /home/hm-user/.config/neomutt/hm@example.com "
source /home/hm-user/.config/neomutt/hm@example.com "
# Source primary account
source /home/hm-user/.config/neomutt/hm@example.com
# Extra configuration

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

@ -4,31 +4,22 @@ 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
set delete = yes
# Binds
# Macros
# Register accounts
# register account hm-account
## register account hm-account
mailboxes "/home/hm-user/Mail/hm-account/Inbox"
folder-hook /home/hm-user/Mail/hm-account/ " \
source /home/hm-user/.config/neomutt/hm-account "
source /home/hm-user/.config/neomutt/hm-account "
# Source primary account
source /home/hm-user/.config/neomutt/hm-account
# Extra configuration

2
tests/modules/programs/neomutt/neomutt-not-primary.nix
View file

@ -10,7 +10,7 @@
nmt.script = ''
assertFileExists home-files/.config/neomutt/neomuttrc
assertFileContent home-files/.config/neomutt/neomuttrc ${
assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
./neomutt-not-primary-expected.conf
}
'';

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

@ -4,13 +4,10 @@ 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
set delete = yes
# Binds
bind editor <Tab> "complete-query"
bind index,pager \Cp "sidebar-prev"
@ -18,19 +15,16 @@ bind index,pager \Cp "sidebar-prev"
# Macros
macro index s "<save-message>?<tab>"
macro index,pager c "<change-folder>?<change-dir><home>^K=<enter><tab>"
# Register accounts
# register account hm@example.com
## register account hm@example.com
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
folder-hook /home/hm-user/Mail/hm@example.com/ " \
source /home/hm-user/.config/neomutt/hm@example.com "
source /home/hm-user/.config/neomutt/hm@example.com "
# Source primary account
source /home/hm-user/.config/neomutt/hm@example.com
# Extra configuration

4
tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix
View file

@ -52,10 +52,10 @@
nmt.script = ''
assertFileExists home-files/.config/neomutt/neomuttrc
assertFileExists home-files/.config/neomutt/hm@example.com
assertFileContent home-files/.config/neomutt/neomuttrc ${
assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
./neomutt-with-binds-expected.conf
}
assertFileContent home-files/.config/neomutt/hm@example.com ${
assertFileContent $(normalizeStorePaths home-files/.config/neomutt/hm@example.com) ${
./hm-example.com-expected
}
'';

4
tests/modules/programs/neomutt/neomutt-with-binds.nix
View file

@ -48,10 +48,10 @@
nmt.script = ''
assertFileExists home-files/.config/neomutt/neomuttrc
assertFileExists home-files/.config/neomutt/hm@example.com
assertFileContent home-files/.config/neomutt/neomuttrc ${
assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
./neomutt-with-binds-expected.conf
}
assertFileContent home-files/.config/neomutt/hm@example.com ${
assertFileContent $(normalizeStorePaths home-files/.config/neomutt/hm@example.com) ${
./hm-example.com-expected
}
'';

2
tests/modules/programs/neomutt/neomutt-with-gpg.nix
View file

@ -17,7 +17,7 @@
nmt.script = ''
assertFileExists home-files/.config/neomutt/neomuttrc
assertFileExists home-files/.config/neomutt/hm@example.com
assertFileContent home-files/.config/neomutt/neomuttrc ${
assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
./neomutt-expected.conf
}
assertFileContent home-files/.config/neomutt/hm@example.com ${

15
tests/modules/programs/neomutt/neomutt-with-imap-expected.conf
View file

@ -4,32 +4,23 @@ 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
set delete = yes
# Binds
# Macros
# Register accounts
set account_command = '/nix/store/00000000000000000000000000000000-account-command.sh/bin/account-command.sh'
# register account hm@example.com
## register account hm@example.com
mailboxes "imaps://home.manager@imap.example.com:993/Inbox"
account-hook imaps://home.manager@imap.example.com:993/ " \
source /home/hm-user/.config/neomutt/hm@example.com "
source /home/hm-user/.config/neomutt/hm@example.com "
# Source primary account
source /home/hm-user/.config/neomutt/hm@example.com
# Extra configuration

15
tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes-expected.conf
View file

@ -4,34 +4,25 @@ 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
set delete = yes
# Binds
# Macros
# Register accounts
set account_command = '/nix/store/00000000000000000000000000000000-account-command.sh/bin/account-command.sh'
# register account hm@example.com
## register account hm@example.com
named-mailboxes "someCustomName" "/home/hm-user/Mail/hm@example.com/Inbox"
mailboxes "/home/hm-user/Mail/hm@example.com/Sent"
named-mailboxes "Spam" "imaps://home.manager@imap.example.com:993/Junk Email"
mailboxes "/home/hm-user/Mail/hm@example.com/Trash"
folder-hook /home/hm-user/Mail/hm@example.com/ " \
source /home/hm-user/.config/neomutt/hm@example.com "
source /home/hm-user/.config/neomutt/hm@example.com "
# Source primary account
source /home/hm-user/.config/neomutt/hm@example.com
# Extra configuration

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

@ -4,33 +4,24 @@ 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
set delete = yes
# Binds
# Macros
# Register accounts
# register account hm@example.com
## register account hm@example.com
named-mailboxes "someCustomName" "/home/hm-user/Mail/hm@example.com/Inbox"
mailboxes "/home/hm-user/Mail/hm@example.com/Sent"
named-mailboxes "Spam" "/home/hm-user/Mail/hm@example.com/Junk Email"
mailboxes "/home/hm-user/Mail/hm@example.com/Trash"
folder-hook /home/hm-user/Mail/hm@example.com/ " \
source /home/hm-user/.config/neomutt/hm@example.com "
source /home/hm-user/.config/neomutt/hm@example.com "
# Source primary account
source /home/hm-user/.config/neomutt/hm@example.com
# Extra configuration

2
tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix
View file

@ -31,7 +31,7 @@
nmt.script = ''
assertFileExists home-files/.config/neomutt/neomuttrc
assertFileExists home-files/.config/neomutt/hm@example.com
assertFileContent home-files/.config/neomutt/neomuttrc ${
assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
./neomutt-with-named-mailboxes-expected.conf
}
assertFileContent home-files/.config/neomutt/hm@example.com ${

2
tests/modules/programs/neomutt/neomutt-with-signature.nix
View file

@ -29,7 +29,7 @@
nmt.script = ''
assertFileExists home-files/.config/neomutt/neomuttrc
assertFileExists home-files/.config/neomutt/hm@example.com
assertFileContent home-files/.config/neomutt/neomuttrc ${
assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
./neomutt-expected.conf
}
expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com")