Enable e-mail services for auto-upgrade

options/auto-upgrade.nix

@@ -18,6 +18,7 @@ in
     };
 
     config = mkIf cfg.enable {
+        email.enable = true;
         systemd.services.nixos-upgrade.script = mkOverride 50 (
             let
                 nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";

options/email.nix

@@ -1,7 +1,11 @@
 { config, lib, ... }:
 with lib;
+let
+    cfg = config.email;
+in
 {
     options.email = {
+        enable = lib.mkEnableOption "Allow sending system status e-mails via sendmail";
         fromAddress = mkOption {
             type = types.str;
             example = "noreply@example.com";
@@ -25,4 +29,21 @@ with lib;
             '';
         };
     };
+
+    config.programs.msmtp = lib.mkIf cfg.enable {
+        enable = true;
+        setSendmail = true;
+        accounts = {
+            default = {
+                auth = true;
+                host = "gvfr.de";
+                passwordeval = "cat /secrets/email_password.txt";
+                user = cfg.fromAddress;
+                from = cfg.fromAddress;
+                port = 465;
+                tls = true;
+                tls_starttls = false;
+            };
+        };
+    };
 }

options/status-email.nix

@@ -10,24 +10,9 @@ in
         enable = lib.mkEnableOption "Send systemd status e-mails";
     };
 
-    config.programs.msmtp = lib.mkIf cfg.enable {
-        enable = true;
-        setSendmail = true;
-        accounts = {
-            default = {
-                auth = true;
-                host = "gvfr.de";
-                passwordeval = "cat /secrets/email_password.txt";
-                user = fromAddress;
-                from = fromAddress;
-                port = 465;
-                tls = true;
-                tls_starttls = false;
-            };
-        };
-    };
-
-    config.systemd.services."status-email@" = let
+    config = lib.mkIf cfg.enable {
+        email.enable = true;
+        systemd.services."status-email@" = let
             sendStatusEmail = pkgs.writeScript "send-status-email" ''
                 #!${pkgs.bash}/bin/bash
 
@@ -83,7 +68,7 @@ in
                 ERRMAIL
             '';
         in
-    lib.mkIf cfg.enable {
+        {
             unitConfig = {
                 Description = "Send a status e-mail for %I";
             };
@@ -92,4 +77,5 @@ in
                 ExecStart = "${sendStatusEmail} %i";
             };
         };
+    };
 }