Provide option to use msmtpq wrapper script instead of msmtp

[mntn-xyz]

If msmtp is enabled, the git configuration is generated using msmtp: see git.nix. Msmtp comes with msmtpq, which queues the email for later sending if the SMTP server is unavailable. This is essential for an offline-first workflow.

I note that code in other areas references msmtpq, for instance neomutt-accounts.nix uses msmtpq automatically if msmtp is enabled. Is there any reason not to do the same for git?

If all packages should use msmtpq by default, then it makes sense to use it everywhere. If it should be selectable, then msmtp should have a flag to use msmtpq.

[mntn-xyz]

Following up, I'm glad to make a PR for this but I'm not sure what the scope should be:

1. Trivial - just change git.nix to use the msmtpq wrapper instead of msmtp when generating the git configuration
2. Full coverage/consistency - search for anywhere that msmtp would be executed and change to the msmtpq wrapper
3. Add an option - add an option to msmtp to use msmtpq, then search for anywhere that msmtp/msmtpq is used and use either msmtp or msmtpq depending on the value of the option

The first option obviously has the least impact, but I feel like I will be bitten by this again with other packages. The last one provides the most flexibility in case someone absolutely never wants to use msmtpq, for instance if they prefer to have SMTP attempts fail when a connection is not available. Right now, with a mix of msmtp and msmtpq used in different packages, it seems that SMTP behavior is somewhat unpredictable. For that reason I lean toward option 2 or 3, but I feel that I'd like someone else to weigh in before I make a PR.

[berbiche]

I would improve the third option like this:

• Add an option to msmtp to use msmtpq and add a private (internal = true) option that contains a path to msmtp package to use depending on the former option (${pkgs.msmtp}/bin/msmtp or ${pkgs.msmtpq}/bin/msmtpq).

Every user of msmtp would then only need to use ${config.msmtp.msmtpPackage}

[mntn-xyz]

Thanks, that does sound like an improvement over my original suggestion. The msmtpq command is just a wrapper script distributed with the msmtp package so I'll probably reference it as msmtpCommand rather than msmtpPackage, as they are the same package.

[stale]

Thank you for your contribution! I marked this issue as stale due to inactivity. Please be considerate of people watching this issue and receiving notifications before commenting 'I have this issue too'. We welcome additional information that will help resolve this issue. Please read the relevant sections below before commenting.

If you are the original author of the issue

• If this is resolved, please consider closing it so that the maintainers know not to focus on this.
• If this might still be an issue, but you are not interested in promoting its resolution, please consider closing it while encouraging others to take over and reopen an issue if they care enough.
• If you know how to solve the issue, please consider submitting a Pull Request that addresses this issue.

If you are not the original author of the issue

• If you are also experiencing this issue, please add details of your situation to help with the debugging process.
• If you know how to solve the issue, please consider submitting a Pull Request that addresses this issue.

Memorandum on closing issues

Don't be afraid to manually close an issue, even if it holds valuable information. Closed issues stay in the system for people to search, read, cross-reference, or even reopen – nothing is lost! Closing obsolete issues is an important way to help maintainers focus their time and effort.

[octvs]

To bring this issue up to date, here are current references to msmtp on the repo

~/git/home-manager/master $ rg "msmtp" -g '!{tests}'
modules/programs/git.nix
582:                if account.msmtp.enable then
584:                    sendmailCmd = "${pkgs.msmtp}/bin/msmtp";

modules/programs/himalaya.nix
90:      sendmailConfig = optionalAttrs (isNull account.smtp && !isNull account.msmtp) {
92:        message.send.backend.cmd = lib.getExe pkgs.msmtp;

modules/programs/alot/accounts.nix
11:        Command to send a mail. If msmtp is enabled for the account,
13:        {command}`msmtpq --read-envelope-from --read-recipients`.
61:      if config.msmtp.enable then "msmtpq --read-envelope-from --read-recipients" else null

modules/programs/neomutt/accounts.nix
64:      default = if config.msmtp.enable then "msmtpq --read-envelope-from --read-recipients" else null;
66:        if config.msmtp.enable then
67:          "msmtpq --read-envelope-from --read-recipients"
71:      example = "msmtpq --read-envelope-from --read-recipients";

modules/programs/aerc/accounts.nix
245:        msmtp = cfg: {
246:          outgoing = "msmtpq --read-envelope-from --read-recipients";
276:        if account.msmtp.enable then
277:          mkConfig.msmtp account

modules/programs/msmtp/default.nix
10:  cfg = config.programs.msmtp;
12:  msmtpAccounts = lib.filter (a: a.enable && a.msmtp.enable) (
32:        // optionalAttrs (msmtp.tls.fingerprint != null) {
33:          tls_fingerprint = msmtp.tls.fingerprint;
42:        // msmtp.extraConfig
55:    programs.msmtp = {
56:      enable = lib.mkEnableOption "msmtp";
58:      package = lib.mkPackageOption pkgs "msmtp" { };
69:          Content added to msmtp config.
70:          See <https://marlam.de/msmtp/msmtprc.txt> for examples.
72:          Note, if running msmtp fails with the error message "account default
75:          [](#opt-accounts.email.accounts._name_.msmtp.extraConfig).
86:            `programs.msmtp.extraConfig` is deprecated, use `programs.msmtp.configContent` instead.
88:            Example: programs.msmtp.configContent = lib.mkBefore "set syslog";
91:          Extra configuration lines to add to {file}`~/.msmtprc`.
92:          See <https://marlam.de/msmtp/msmtprc.txt> for examples.
94:          Note, if running msmtp fails with the error message "account default
97:          [](#opt-accounts.email.accounts._name_.msmtp.extraConfig).
108:            `programs.msmtp.extraAccounts` is deprecated, use `programs.msmtp.configContent` instead.
110:            Example: programs.msmtp.configContent = lib.mkAfter "set syslog";
113:          Extra configuration lines to add to the end of {file}`~/.msmtprc`.
114:          See <https://marlam.de/msmtp/msmtprc.txt> for examples.
129:        xdg.configFile."msmtp/config".text = cfg.configContent;
131:        programs.msmtp.configContent = lib.mkMerge [
134:          (lib.concatStringsSep "\n\n" (map accountStr msmtpAccounts))
139:          MSMTPQ_Q = "${config.xdg.dataHome}/msmtp/queue";
140:          MSMTPQ_LOG = "${config.xdg.dataHome}/msmtp/queue.log";

modules/programs/msmtp/accounts.nix
3:  options.msmtp = {
8:        Whether to enable msmtp.
13:        {command}`msmtp` or {command}`msmtpq` tool.
14:        For example, {command}`msmtp --account=private` would
29:        {command}`msmtp --serverinfo --tls --tls-certcheck=off`.
40:        Extra configuration options to add to {file}`~/.msmtprc`.
41:        See <https://marlam.de/msmtp/msmtprc.txt> for

modules/misc/news/2025/08/2025-08-09_21-07-00.nix
10:    and a command-line interface which can be used by programs such as fdm and msmtp to authenticate with OAuth2.

modules/programs/astroid/accounts.nix
9:        Command to send a mail. If msmtp is enabled for the account,
11:        {command}`msmtpq --read-envelope-from --read-recipients`.
28:    astroid.sendMailCommand = lib.mkIf config.msmtp.enable (
29:      lib.mkOptionDefault "msmtpq --read-envelope-from --read-recipients"

So all other occurences of msmtp uses msmtpq wrapper as the desired behaviour of the issue report, except git and himalaya modules. Therefore options 1 and 2 offered above are nearly identical.

I have created a draft PR following option 3, any feedback & comment would be welcome.