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

neomutt: fix duplicated extraConfig in account (#1546)

Browse source 
The `accounts.email.accounts.<name>.neomutt.extraConfig` option is
included twice in the resulting config file for the account. One time as
part of the `mraSection`, one time as part of `accountStr` (`accountStr`
includes the `mraSection`). This removes that duplication. I opted to
keep the one in `accounStr`, since `extraConfig` doesn't necessarily
have anything to do with the `mraSection`.
This commit is contained in:
Charlotte Van Petegem 2020-10-09 20:55:35 +02:00 committed by GitHub
parent 8537920706
commit 473d9acdad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/programs/neomutt.nix
View file

@ -124,7 +124,7 @@ let
let let
folderHook = mapAttrsToList setOption (genCommonFolderHooks account // { folderHook = mapAttrsToList setOption (genCommonFolderHooks account // {
folder = "'${account.maildir.absPath}'"; folder = "'${account.maildir.absPath}'";
}) ++ optional (neomutt.extraConfig != "") neomutt.extraConfig; });
in '' in ''
${concatStringsSep "\n" folderHook} ${concatStringsSep "\n" folderHook}
''; '';

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

@ -25,8 +25,6 @@ set realname='H. M. Test'
set record='+Sent' set record='+Sent'
set spoolfile='+Inbox' set spoolfile='+Inbox'
set trash='+Trash' set trash='+Trash'
color status cyan default
# Extra configuration # Extra configuration

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

@ -24,8 +24,6 @@ set realname='H. M. Test'
set record='+Sent' set record='+Sent'
set spoolfile='+Inbox' set spoolfile='+Inbox'
set trash='+Trash' set trash='+Trash'
color status cyan default
# Extra configuration # Extra configuration