From 342b3e3e6df239dc972372e6a641acf052ff74aa Mon Sep 17 00:00:00 2001
From: zincentimeter <2240112342@qq.com>
Date: Tue, 22 Apr 2025 23:22:16 +0800
Subject: [PATCH] msmtp: rename environment variables (#6839)

I've started seeing $HOME/log $HOME/.msmtp.queue.log populated after using
msmtp via neomutt. Although the latter is not, the former is a bit
annoying. Home-manager already tries to avoids this 1, so I was curious to why
this occured.

Interestingly this didn't happen until a month ago, so I've tried to git blame my way out of the problem both on my configuration and on upstream
home-manager however I didn't find a fitting change on the suspected dates.

Home-manager uses2 msmtpq script3 to send emails through which manages
also the queue of mails to be sent. As stated on upstream source of the script
4, it looks for MSMTPQ_Q and MSMTPQ_LOG variables to decide where to

https://git.marlam.de/gitweb/?p=msmtp.git;a=blob_plain;f=scripts/msmtpq/msmtpq;hb=HEAD
---
 modules/programs/msmtp.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/msmtp.nix b/modules/programs/msmtp.nix
index e7d4cf2c..31f42a3e 100644
--- a/modules/programs/msmtp.nix
+++ b/modules/programs/msmtp.nix
@@ -101,8 +101,8 @@ in
     xdg.configFile."msmtp/config".text = configFile msmtpAccounts;
 
     home.sessionVariables = {
-      MSMTP_QUEUE = "${config.xdg.dataHome}/msmtp/queue";
-      MSMTP_LOG = "${config.xdg.dataHome}/msmtp/queue.log";
+      MSMTPQ_Q = "${config.xdg.dataHome}/msmtp/queue";
+      MSMTPQ_LOG = "${config.xdg.dataHome}/msmtp/queue.log";
     };
   };
 }