Skip to content

neomutt/signature: unset if disabled #2877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sumnerevans merged 1 commit into from
Apr 16, 2022
Merged

neomutt/signature: unset if disabled #2877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions modules/programs/neomutt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,11 @@ let

# Extra configuration
${account.neomutt.extraConfig}
'' + optionalString (account.signature.showSignature != "none") ''
Comment thread
sumnerevans marked this conversation as resolved.
'' + (if (account.signature.showSignature == "none") then ''
Comment thread
sumnerevans marked this conversation as resolved.
unset signature
'' else ''
set signature = ${pkgs.writeText "signature.txt" account.signature.text}
'' + optionalString account.notmuch.enable (notmuchSection account);
'') + optionalString account.notmuch.enable (notmuchSection account);

in {
options = {
Expand Down
1 change: 1 addition & 0 deletions tests/modules/programs/neomutt/hm-example.com-expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ set trash='+Trash'
# Extra configuration
color status cyan default

unset signature
# notmuch section
set nm_default_uri = "notmuch:///home/hm-user/Mail"
virtual-mailboxes "My INBOX" "notmuch://?query=tag:inbox"
1 change: 1 addition & 0 deletions tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ set trash='+Trash'

# Extra configuration

unset signature
1 change: 1 addition & 0 deletions tests/modules/programs/neomutt/hm-example.com-msmtp-expected.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ set trash='+Trash'
# Extra configuration
color status cyan default

unset signature
1 change: 1 addition & 0 deletions tests/modules/programs/neomutt/hm-example.com-no-folder-change-expected.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ set trash='+Trash'

# Extra configuration

unset signature