configuration/common/nix.nix

@@ -4,8 +4,6 @@
 
   clerie.nixfiles.enable = true;
 
-  clerie.nixfiles.system-auto-upgrade.enable = true;
-
   nix.settings = {
     trusted-users = [ "@wheel" "@guests" ];
     auto-optimise-store = true;

configuration/common/programs.nix

@@ -10,6 +10,7 @@
     colmena
     vim
     agenix
+    nixfiles-system-upgrade
   ];
 
   programs.mtr.enable = true;

hosts/dn42-il-gw1/configuration.nix

@@ -330,8 +330,8 @@
   '';
 
   clerie.nixfiles.system-auto-upgrade = {
+    enable = true;
     allowReboot = true;
-    autoUpgrade = true;
   };
 
   clerie.monitoring = {

hosts/dn42-il-gw5/configuration.nix

@@ -184,9 +184,8 @@
   '';
 
   clerie.nixfiles.system-auto-upgrade = {
+    enable = true;
     allowReboot = true;
-    autoUpgrade = true;
-    startAt = "*-*-* 06:22:00";
   };
 
   clerie.monitoring = {

hosts/dn42-il-gw6/configuration.nix

@@ -184,9 +184,8 @@
   '';
 
   clerie.nixfiles.system-auto-upgrade = {
+    enable = true;
     allowReboot = true;
-    autoUpgrade = true;
-    startAt = "*-*-* 07:22:00";
   };
 
   clerie.monitoring = {

hosts/nonat/configuration.nix

@@ -40,8 +40,8 @@
   networking.firewall.allowedUDPPorts = [];
 
   clerie.nixfiles.system-auto-upgrade = {
+    enable = true;
     allowReboot = true;
-    autoUpgrade = true;
   };
 
   clerie.monitoring = {

modules/nixfiles/nixfiles-system-upgrade.nix

@@ -15,16 +15,6 @@ in
         default = false;
         description = "Monitor NixOS";
       };
-      autoUpgrade = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Automatically check and install upgrades";
-      };
-      startAt = mkOption {
-        type = with types; nullOr string;
-        default = null;
-        description = "Systemd time string for starting the unit";
-      };
     };
   };
   config = mkIf cfg.enable {
@@ -38,16 +28,13 @@ in
         ExecStart = pkgs.nixfiles-system-upgrade + "/bin/nixfiles-system-upgrade --no-confirm${optionalString cfg.allowReboot " --allow-reboot"}${optionalString (config.clerie.monitoring.enable) " --node-exporter-metrics-path /var/lib/prometheus-node-exporter/textfiles/nixfiles-system-upgrade.prom"}";
       };
     };
-    systemd.timers.nixfiles-system-auto-upgrade = mkIf cfg.autoUpgrade {
+    systemd.timers.nixfiles-system-auto-upgrade = {
       wantedBy = [ "timers.target" ];
       timerConfig = {
-        OnCalendar = if cfg.startAt == null then "*-*-* 05:37:00" else cfg.startAt;
+        OnCalendar = "*-*-* 05:37:00";
-        RandomizedDelaySec = if cfg.startAt == null then "2h" else "10m";
+        RandomizedDelaySec = "2h";
       };
       after = [ "network-online.target" ];
     };
-    environment.systemPackages = with pkgs; [
-      nixfiles-system-upgrade
-    ];
   };
 }