From 72c4f4823b6c6e173da44be7442328133a81e789 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 30 Aug 2026 14:45:07 -0600
Subject: [PATCH] fix nix-autoupgrade email notification to use system msmtp
 config

---
 .../nixos/modules/nmasur/presets/programs/msmtp/msmtp.nix     | 1 +
 .../nixos/modules/nmasur/presets/services/nix-autoupgrade.nix | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/platforms/nixos/modules/nmasur/presets/programs/msmtp/msmtp.nix b/platforms/nixos/modules/nmasur/presets/programs/msmtp/msmtp.nix
index 4ee6c48d..295ccd4e 100644
--- a/platforms/nixos/modules/nmasur/presets/programs/msmtp/msmtp.nix
+++ b/platforms/nixos/modules/nmasur/presets/programs/msmtp/msmtp.nix
@@ -47,6 +47,7 @@ in
           host = cfg.host;
           passwordeval = "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${pkgs.writeText "mailpass-system.age" (builtins.readFile cfg.passwordFile)}";
           user = cfg.user;
+          from = cfg.user;
           from_full_name = "${config.networking.hostName} System";
           port = 465;
           tls = true;
diff --git a/platforms/nixos/modules/nmasur/presets/services/nix-autoupgrade.nix b/platforms/nixos/modules/nmasur/presets/services/nix-autoupgrade.nix
index b9f995d9..5821aab6 100644
--- a/platforms/nixos/modules/nmasur/presets/services/nix-autoupgrade.nix
+++ b/platforms/nixos/modules/nmasur/presets/services/nix-autoupgrade.nix
@@ -6,7 +6,6 @@
 }:
 
 let
-  inherit (config.nmasur.settings) username;
   cfg = config.nmasur.presets.services.nix-autoupgrade;
 in
 
@@ -55,8 +54,7 @@ in
           systemctl status $SERVICE_ID >> $TEMPFILE
           set -e
           ${lib.getExe pkgs.msmtp} \
-              --file=${config.home-manager.users.${username}.xdg.configHome}/msmtp/config \
-              --account=system \
+              --account=default \
               ${address} < $TEMPFILE
         '';
       };