modules/nixos: enable comin by default, remove autoUpgrade

hosts/build01/configuration.nix

@@ -8,9 +8,6 @@
     inputs.self.nixosModules.community-builder
   ];
 
-  services.comin.enable = true;
-  system.autoUpgrade.enable = false;
-
   # Emulate riscv64 until we have proper builders
   boot.binfmt.emulatedSystems = [ "riscv64-linux" ];
 

hosts/build04/configuration.nix

@@ -9,9 +9,6 @@
     inputs.self.nixosModules.remote-builder
   ];
 
-  services.comin.enable = true;
-  system.autoUpgrade.enable = false;
-
   nixCommunity.remote-builder.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEmdo1x1QkRepZf7nSe+OdEWX+wOjkBLF70vX9F+xf68 builder";
 
   networking.hostName = "build04";

modules/nixos/common/auto-upgrade.nix

@@ -1,14 +0,0 @@
-{ lib, ... }:
-{
-  system.autoUpgrade.enable = lib.mkDefault true;
-  system.autoUpgrade.flake = "github:nix-community/infra";
-  system.autoUpgrade.dates = "hourly";
-  system.autoUpgrade.flags = [ "--option" "accept-flake-config" "true" "--option" "tarball-ttl" "0" ];
-
-  # Restart the upgrade service if it fails twice in 5 seconds.
-  systemd.services.nixos-upgrade = {
-    unitConfig.StartLimitBurst = 2;
-    unitConfig.StartLimitIntervalSec = 5;
-    serviceConfig.Restart = "on-failure";
-  };
-}

modules/nixos/common/comin.nix

@@ -1,4 +1,4 @@
-{ inputs, lib, ... }:
+{ inputs, ... }:
 {
   imports = [
     inputs.comin.nixosModules.comin
@@ -9,7 +9,7 @@
   ];
 
   services.comin = {
-    enable = lib.mkDefault false;
+    enable = true;
     remotes = [
       {
         url = "https://github.com/nix-community/infra.git";

modules/nixos/common/default.nix

@@ -1,7 +1,6 @@
 { config, inputs, pkgs, ... }:
 {
   imports = [
-    ./auto-upgrade.nix
     ./comin.nix
     ../../shared/known-hosts.nix
     ../../shared/nix-daemon.nix