From a3b627359b2dea247fb2ec45dad8129c2be1211c Mon Sep 17 00:00:00 2001
From: imxyy_soope_ <imxyy1soope1@gmail.com>
Date: Sun, 13 Jul 2025 13:31:48 +0800
Subject: [PATCH] fix: systemd service restart

---
 config/hosts/imxyy-nix-server/build.nix     |  7 ++-----
 config/hosts/imxyy-nix-server/minecraft.nix |  2 +-
 config/hosts/imxyy-nix-server/net.nix       | 12 ++++--------
 config/hosts/imxyy-nix-x16/net.nix          |  6 ++----
 config/hosts/imxyy-nix/net.nix              |  6 ++----
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/config/hosts/imxyy-nix-server/build.nix b/config/hosts/imxyy-nix-server/build.nix
index 4a8dd3f..3ab336c 100644
--- a/config/hosts/imxyy-nix-server/build.nix
+++ b/config/hosts/imxyy-nix-server/build.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   sopsRoot,
   ...
@@ -15,10 +14,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-server-nixremote.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
+      Restart = "always";
+      RestartSec = 30;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];
diff --git a/config/hosts/imxyy-nix-server/minecraft.nix b/config/hosts/imxyy-nix-server/minecraft.nix
index bc77ee3..e743336 100644
--- a/config/hosts/imxyy-nix-server/minecraft.nix
+++ b/config/hosts/imxyy-nix-server/minecraft.nix
@@ -8,7 +8,7 @@
       WorkingDirectory = "/opt/minecraft/fabric1.20.6";
       ExecStart = "${lib.getExe' pkgs.openjdk21 "java"} -Xms1G -Xmx5G -jar fabric-server-mc.1.20.6-loader.0.15.11-launcher.1.0.1.jar";
       Restart = "always";
-      RestartSec = "10s";
+      RestartSec = 120;
     };
   };
   my.persist = {
diff --git a/config/hosts/imxyy-nix-server/net.nix b/config/hosts/imxyy-nix-server/net.nix
index cdefc66..ae43e6a 100644
--- a/config/hosts/imxyy-nix-server/net.nix
+++ b/config/hosts/imxyy-nix-server/net.nix
@@ -450,10 +450,8 @@
   };
   systemd.services."headscale" = {
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
+      Restart = "always";
+      RestartSec = 120;
     };
     after = [
       "podman-obligator.service"
@@ -472,10 +470,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-server.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
+      Restart = "always";
+      RestartSec = 30;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];
diff --git a/config/hosts/imxyy-nix-x16/net.nix b/config/hosts/imxyy-nix-x16/net.nix
index d9381f1..b12a6ea 100644
--- a/config/hosts/imxyy-nix-x16/net.nix
+++ b/config/hosts/imxyy-nix-x16/net.nix
@@ -44,10 +44,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-x16.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
+      Restart = "always";
+      RestartSec = 30;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];
diff --git a/config/hosts/imxyy-nix/net.nix b/config/hosts/imxyy-nix/net.nix
index 4f2ebbd..5a21338 100644
--- a/config/hosts/imxyy-nix/net.nix
+++ b/config/hosts/imxyy-nix/net.nix
@@ -115,10 +115,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
+      Restart = "always";
+      RestartSec = 30;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];