chore: update

machines/r2s/configuration.nix

@@ -76,6 +76,7 @@
     lm_sensors
     lsof
     mtr
+    python3
     screen
     sops
     stuntman

machines/r2s/hardware.nix

@@ -55,7 +55,6 @@
       includeDefaultModules = false;
     };
     blacklistedKernelModules = [ "hantro_vpu" "drm" "lima" "videodev" ];
-    kernelModules = [ "ledtrig_netdev" ];
     tmp.useTmpfs = true;
   };
 
@@ -108,10 +107,12 @@
 
   systemd.services."setup-net-leds" = {
     description = "Setup network LEDs";
-    unitConfig = { DefaultDependencies = "no"; };
     serviceConfig = { Type = "simple"; };
-    wantedBy = [ "sysinit.target" ];
+    wantedBy = [ "multi-user.target" ];
+    wants = [ "network-online.target" ];
+    after = [ "network-online.target" ];
     script = ''
+      ${pkgs.kmod}/bin/modprobe ledtrig_netdev
       cd /sys/class/leds/nanopi-r2s:green:lan
       echo netdev > trigger
       echo 1 | tee link tx rx >/dev/null

machines/r2s/tproxy.nix

@@ -63,11 +63,16 @@ in
 
   systemd.services.udpspeeder = {
     description = "UDPspeeder";
-    after = [ "network.target" ];
+    wants = [ "network-online.target" ];
+    after = [ "network-online.target" ];
     wantedBy = [ "multi-user.target" ];
     script = ''
       xargs -a ${secrets."udpspeeder.conf".path} ${pkgs.udpspeeder}/bin/speederv2
     '';
+    serviceConfig = {
+      Restart = "on-failure";
+      RestartSec = 4;
+    };
   };
   sops.secrets."udpspeeder.conf".restartUnits = [ "udpspeeder.service" ];
 

machines/srv-m/mail-dovecot.nix

@@ -70,7 +70,7 @@ in
       Spam.specialUse = "Junk";
       Templates.auto = "create";
     };
-    sieveScripts = {
+    sieve.scripts = {
       after = builtins.toFile "spam.sieve" ''
         require ["variables", "fileinto", "envelope", "subaddress", "mailbox", "duplicate"];