From f23ef217300ed92be8752f4a8d24cda53272d864 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 18 Dec 2024 23:47:02 +0100
Subject: [PATCH] fix(etna): replace systemd timers by startAt

---
 global/utils.nix           |  2 +-
 systems/etna/minecraft.nix | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/global/utils.nix b/global/utils.nix
index fc51916..c0eda93 100644
--- a/global/utils.nix
+++ b/global/utils.nix
@@ -37,7 +37,7 @@
   }: let
     inherit (_config.virtualisation.oci-containers) backend;
   in {
-    virtualisation.oci-containers.containers.${name} = {
+    virtualisation.oci-containers.containers."mc-${name}" = {
       image = "itzg/minecraft-server:${tag}";
       ports = ["${builtins.toString port}:25565"] ++ extraPorts;
       volumes = ["${dataDir}:/data"];
diff --git a/systems/etna/minecraft.nix b/systems/etna/minecraft.nix
index f6e0f86..8a0c797 100644
--- a/systems/etna/minecraft.nix
+++ b/systems/etna/minecraft.nix
@@ -59,18 +59,15 @@ in {
 
   systemd.services.restart-minecraft-servers = {
     wantedBy = ["multi-user.target"];
-    script = ''
-      ${lib.getExe' pkgs.systemd "systemctl"} restart ${backend}-*.service
-    '';
-    serviceConfig.Type = "oneshot";
-  };
+    startAt = "*-*-* 05:00:00";
 
-  systemd.timers.restart-minecraft-servers = {
-    wantedBy = ["timers.target"];
-    timerConfig = {
-      OnCalendar = "*-*-* 05:00:00";
-      Persistent = true;
-      Unit = "restart-minecraft-servers.service";
+    script = ''
+      ${lib.getExe' pkgs.systemd "systemctl"} restart ${backend}-mc-*.service
+    '';
+
+    serviceConfig = {
+      Type = "oneshot";
+      DynamicUser = true;
     };
   };
 }