eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-27 05:29:46 +01:00
Code Issues Releases Wiki Activity

programs.neomutt: Make manual configuration take precedence over generated settings (#1896)

Browse source
This commit is contained in:
malte-v 2021-04-11 19:52:31 +02:00 committed by GitHub
parent f567ea8228
commit 91418d3e57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/programs/neomutt.nix
View file

@ -312,16 +312,16 @@ in {
${optionalString cfg.vimKeys ${optionalString cfg.vimKeys
"source ${pkgs.neomutt}/share/doc/neomutt/vim-keys/vim-keys.rc"} "source ${pkgs.neomutt}/share/doc/neomutt/vim-keys/vim-keys.rc"}
# Extra configuration
${optionsStr cfg.settings}
${cfg.extraConfig}
# Register accounts # Register accounts
${concatMapStringsSep "\n" registerAccount neomuttAccounts} ${concatMapStringsSep "\n" registerAccount neomuttAccounts}
# Source primary account # Source primary account
source ${accountFilename primary} source ${accountFilename primary}
# Extra configuration
${optionsStr cfg.settings}
${cfg.extraConfig}
''; '';
}; };

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

@ -16,11 +16,6 @@ set delete = yes
# Extra configuration
# Register accounts # Register accounts
# register account hm@example.com # register account hm@example.com
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox" mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
@ -30,3 +25,8 @@ folder-hook /home/hm-user/Mail/hm@example.com/ " \
# Source primary account # Source primary account
source /home/hm-user/.config/neomutt/hm@example.com source /home/hm-user/.config/neomutt/hm@example.com
# Extra configuration

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

@ -16,11 +16,6 @@ set delete = yes
# Extra configuration
# Register accounts # Register accounts
# register account hm-account # register account hm-account
mailboxes "/home/hm-user/Mail/hm-account/Inbox" mailboxes "/home/hm-user/Mail/hm-account/Inbox"
@ -30,3 +25,8 @@ folder-hook /home/hm-user/Mail/hm-account/ " \
# Source primary account # Source primary account
source /home/hm-user/.config/neomutt/hm-account source /home/hm-user/.config/neomutt/hm-account
# Extra configuration

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

@ -18,11 +18,6 @@ macro index,pager c "<change-folder>?<change-dir><home>^K=<enter><tab>"
# Extra configuration
# Register accounts # Register accounts
# register account hm@example.com # register account hm@example.com
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox" mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
@ -32,3 +27,8 @@ folder-hook /home/hm-user/Mail/hm@example.com/ " \
# Source primary account # Source primary account
source /home/hm-user/.config/neomutt/hm@example.com source /home/hm-user/.config/neomutt/hm@example.com
# Extra configuration