From 361a23f4d32e7d373156961582a888db314d860a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Tue, 21 Jul 2026 20:11:28 +0900
Subject: [PATCH] base/postfix: remove, base:nullmailer: init

---
 base/default.nix                       |  2 +-
 base/services/nullmailer.nix           | 15 +++++++++++++++
 base/services/postfix.nix              | 22 ----------------------
 hosts/temmie/services/userweb/mail.nix | 10 +---------
 4 files changed, 17 insertions(+), 32 deletions(-)
 create mode 100644 base/services/nullmailer.nix
 delete mode 100644 base/services/postfix.nix

diff --git a/base/default.nix b/base/default.nix
index f244e21..e4487dc 100644
--- a/base/default.nix
+++ b/base/default.nix
@@ -30,9 +30,9 @@
     ./services/journald-upload.nix
     ./services/logrotate.nix
     ./services/nginx.nix
+    ./services/nullmailer.nix
     ./services/openssh.nix
     ./services/polkit.nix
-    ./services/postfix.nix
     ./services/prometheus-flake-input-exporter.nix
     ./services/prometheus-node-exporter.nix
     ./services/prometheus-systemd-exporter.nix
diff --git a/base/services/nullmailer.nix b/base/services/nullmailer.nix
new file mode 100644
index 0000000..6ef63c2
--- /dev/null
+++ b/base/services/nullmailer.nix
@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+{
+  services.nullmailer = {
+    enable = true;
+
+    config = {
+      adminaddr = "root@pvv.ntnu.no";
+      defaultdomain = "pvv.ntnu.no";
+      defaulthost = "pvv.ntnu.no";
+
+      me = lib.mkDefault config.networking.fqdn;
+      remotes = lib.mkDefault "smtp.pvv.ntnu.no smtp port=587 starttls";
+    };
+  };
+}
diff --git a/base/services/postfix.nix b/base/services/postfix.nix
deleted file mode 100644
index e721faf..0000000
--- a/base/services/postfix.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.services.postfix;
-in
-{
-  services.postfix = {
-    enable = true;
-
-    settings.main = {
-      myhostname = "${config.networking.hostName}.pvv.ntnu.no";
-      mydomain = "pvv.ntnu.no";
-
-      # Nothing should be delivered to this machine
-      mydestination = [ ];
-
-      relayhost = [ "smtp.pvv.ntnu.no:465" ];
-
-      smtp_tls_wrappermode = "yes";
-      smtp_tls_security_level = "encrypt";
-    };
-  };
-}
diff --git a/hosts/temmie/services/userweb/mail.nix b/hosts/temmie/services/userweb/mail.nix
index 37dc1e2..411661d 100644
--- a/hosts/temmie/services/userweb/mail.nix
+++ b/hosts/temmie/services/userweb/mail.nix
@@ -1,14 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  services.postfix.enable = lib.mkForce false;
-
-  services.nullmailer = {
-    enable = true;
-    config = {
-      me = config.networking.fqdn;
-      remotes = "mail.pvv.ntnu.no smtp --port=25";
-    };
-  };
+  services.nullmailer.enable = true;
 
   services.bro = {
     enable = true;