From c032f4c09c83feb933d520ccce80e70a1516ca35 Mon Sep 17 00:00:00 2001
From: aristote <quentin.aristote@irif.fr>
Date: Fri, 21 Nov 2025 09:49:24 +0100
Subject: home: check network before daily services

---
 modules/nixos/personal/system.nix | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'modules/nixos/personal')

diff --git a/modules/nixos/personal/system.nix b/modules/nixos/personal/system.nix
index 3337b96..559b3fc 100644
--- a/modules/nixos/personal/system.nix
+++ b/modules/nixos/personal/system.nix
@@ -68,29 +68,16 @@ in
 
       remoteBuilder = with cfgRemote.builder; "${hostName}.${domain}";
 
-      checkNetwork = {
-        path = [ pkgs.unixtools.ping ];
-        # Check network connectivity
-        preStart = "(${
-          lib.concatMapStringsSep " && " (host: "ping -c 1 ${host}") cfg.autoUpgrade.checkHosts
-        }) || kill -s SIGUSR1 $$";
-        unitConfig = {
-          StartLimitIntervalSec = 300;
-          StartLimitBurst = 5;
-        };
-        serviceConfig = lib.mkIf (!config.personal.monitoring.enable) {
-          Restart = "on-abort";
-          RestartSec = 30;
-          RestartMode = "direct"; # dependent units will not fail
-        };
-      };
     in
     lib.mkMerge [
       (lib.mkIf hasFlake {
         system.autoUpgrade.flake = cfg.flake;
         systemd.services.flake-update = lib.mkIf hasFlakeInputs (
           lib.mkMerge [
-            checkNetwork
+            (pkgs.lib.personal.services.checkNetwork {
+              hosts = cfg.autoUpgrade.checkHosts;
+              restart = !config.personal.monitoring.enable;
+            })
             {
               description = "Update flake inputs";
               serviceConfig.Type = "oneshot";
@@ -146,7 +133,10 @@ in
           flags = lib.optional (!hasFlake) "--upgrade-all";
         };
         systemd.services.nixos-upgrade = lib.mkMerge [
-          checkNetwork
+          (pkgs.lib.personal.services.checkNetwork {
+            hosts = cfg.autoUpgrade.checkHosts;
+            restart = !config.personal.monitoring.enable;
+          })
           {
             path =
               lib.optional reboot pkgs.coreutils
-- 
cgit v1.2.3