[email] Move email config from user-specific to NixOS-specific

Author: notthebee

machines/nixos/default.nix

@@ -78,6 +78,15 @@
     defaultEditor = true;
   };
 
+  email = {
+    enable = true;
+    fromAddress = "[email protected]";
+    toAddress = "[email protected]";
+    smtpServer = "email-smtp.eu-west-1.amazonaws.com";
+    smtpUsername = "AKIAYYXVLL34J7LSXFZF";
+    smtpPasswordPath = config.age.secrets.smtpPassword.path;
+  };
+
   security = {
     doas.enable = lib.mkDefault false;
     sudo = {

modules/email/default.nix

@@ -1,46 +1,53 @@
-{ config, pkgs, lib, builtins, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
-  inherit (lib) mkIf types mkDefault mkOption mkMerge strings;
-  inherit (builtins) head toString map tail;
-in {
+  cfg = config.email;
+in
+{
   options.email = {
-    fromAddress = mkOption {
+    enable = lib.mkEnableOption "Email sending functionality";
+    fromAddress = lib.mkOption {
       description = "The 'from' address";
-      type = types.str;
+      type = lib.types.str;
       default = "[email protected]";
     };
-    toAddress = mkOption {
+    toAddress = lib.mkOption {
       description = "The 'to' address";
-      type = types.str;
+      type = lib.types.str;
       default = "[email protected]";
     };
-    smtpServer = mkOption {
+    smtpServer = lib.mkOption {
       description = "The SMTP server address";
-      type = types.str;
+      type = lib.types.str;
       default = "smtp.example.com";
     };
-    smtpUsername = mkOption {
+    smtpUsername = lib.mkOption {
       description = "The SMTP username";
-      type = types.str;
+      type = lib.types.str;
       default = "[email protected]";
     };
-    smtpPasswordPath = mkOption {
+    smtpPasswordPath = lib.mkOption {
       description = "Path to the secret containing SMTP password";
-      type = types.path;
-    };
+      type = lib.types.path;
     };
+  };
 
-  config.programs.msmtp = {
-    enable = true;
-    accounts.default = {
-      auth = true;
-      host = config.email.smtpServer;
-      from = config.email.fromAddress;
-      user = config.email.smtpUsername;
-      tls = true;
-      passwordeval = "${pkgs.coreutils}/bin/cat ${config.email.smtpPasswordPath}";
+  config = lib.mkIf cfg.enable {
+    programs.msmtp = {
+      enable = true;
+      accounts.default = {
+        auth = true;
+        host = config.email.smtpServer;
+        from = config.email.fromAddress;
+        user = config.email.smtpUsername;
+        tls = true;
+        passwordeval = "${pkgs.coreutils}/bin/cat ${config.email.smtpPasswordPath}";
+      };
     };
   };
 
-
-  }
+}

modules/podman/default.nix

@@ -2,7 +2,6 @@
   config,
   inputs,
   pkgs,
-  lib,
   ...
 }:
 {
@@ -12,14 +11,6 @@
     file = "${inputs.secrets}/hashedUserPassword.age";
   };
 
-  email = {
-    fromAddress = "[email protected]";
-    toAddress = "[email protected]";
-    smtpServer = "email-smtp.eu-west-1.amazonaws.com";
-    smtpUsername = "AKIAYYXVLL34J7LSXFZF";
-    smtpPasswordPath = config.age.secrets.smtpPassword.path;
-  };
-
   users = {
     users = {
       notthebee = {