1 files changed, 3 insertions, 30 deletions

diff --git a/ymir.nix b/ymir.nix
index fd373220..00149d06 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -32,6 +32,7 @@ in rec {
       ./custom/tinc/def.nix
       ./custom/ymir-nginx.nix
       ./custom/uucp.nix
+      ./custom/unit-status-mail.nix
     ];
 
   boot.loader.grub = {
@@ -898,36 +899,8 @@ in rec {
     git -C /etc/nixos pull
     git -C /etc/nixos submodule update
   '';
-  systemd.services."nixos-upgrade".onFailure = ["unit-status-mail@%n.service"];
 
-  systemd.services."unit-status-mail@" = {
-    serviceConfig = {
-      Type = "oneshot";
-    };
-    scriptArgs = "%I \"Hostname: %H\" \"Machine-ID: %m\" \"Boot-ID: %b\"";
-    script = ''
-      #!${pkgs.stdenv.shell}
-      MAILTO="root"
-      MAILFROM="unit-status-mailer"
-      UNIT=$1
-
-      EXTRA=""
-      for e in "''${@:2}"; do
-        EXTRA+="$e"$'\n'
-      done
-
-      UNITSTATUS=$(systemctl status $UNIT)
-
-      ${config.security.wrapperDir}/sendmail $MAILTO <<EOF
-      From:$MAILFROM
-      To:$MAILTO
-      Subject:Status of $UNIT
-
-      Status report for unit: $UNIT
-      $EXTRA
-
-      $UNITSTATUS
-      EOF
-    '';
+  systemd.status-mail = {
+    onFailure = [ "nixos-upgrade" ];
   };
 }