modules: move builder into common

nix-community · Nov 21, 2024 · 36be7ae · 36be7ae
1 parent 0186394
commit 36be7ae
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 35 deletions.
diff --git a/hosts/build01/default.nix b/hosts/build01/default.nix
@@ -1,7 +1,6 @@
 { inputs, ... }:
 {
   imports = [
-    inputs.self.nixosModules.builder
     inputs.self.nixosModules.community-builder
     inputs.self.nixosModules.disko-zfs
     inputs.srvos.nixosModules.hardware-hetzner-online-amd

diff --git a/hosts/build02/default.nix b/hosts/build02/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./nixpkgs-update-backup.nix
     ./nixpkgs-update.nix
-    inputs.self.nixosModules.builder
     inputs.self.nixosModules.disko-zfs
     inputs.self.nixosModules.nginx
     inputs.srvos.nixosModules.hardware-hetzner-online-amd

diff --git a/hosts/build03/default.nix b/hosts/build03/default.nix
@@ -4,7 +4,6 @@
     ./builders.nix
     ./postgresql.nix
     inputs.self.nixosModules.buildbot
-    inputs.self.nixosModules.builder
     inputs.self.nixosModules.cgroups
     inputs.self.nixosModules.ci-builder
     inputs.self.nixosModules.disko-zfs

diff --git a/hosts/build04/default.nix b/hosts/build04/default.nix
@@ -1,7 +1,6 @@
 { inputs, ... }:
 {
   imports = [
-    inputs.self.nixosModules.builder
     inputs.self.nixosModules.cgroups
     inputs.self.nixosModules.ci-builder
     inputs.self.nixosModules.disko-zfs

diff --git a/hosts/darwin01/default.nix b/hosts/darwin01/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    inputs.self.darwinModules.builder
     inputs.self.darwinModules.community-builder
   ];
 

diff --git a/hosts/darwin02/default.nix b/hosts/darwin02/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    inputs.self.darwinModules.builder
     inputs.self.darwinModules.ci-builder
     inputs.self.darwinModules.hercules-ci
     inputs.self.darwinModules.remote-builder

diff --git a/modules/darwin/builder.nix → modules/darwin/common/builder.nix b/modules/darwin/builder.nix → modules/darwin/common/builder.nix
diff --git a/modules/darwin/common/default.nix b/modules/darwin/common/default.nix
@@ -4,6 +4,7 @@
     ../../shared/known-hosts.nix
     ../../shared/nix-daemon.nix
     ./apfs-cleanup.nix
+    ./builder.nix
     ./network.nix
     ./packages.nix
     ./reboot.nix

diff --git a/modules/nixos/builder.nix b/modules/nixos/builder.nix
diff --git a/modules/nixos/common/builder.nix b/modules/nixos/common/builder.nix
@@ -0,0 +1,32 @@
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  config = lib.mkIf (lib.hasPrefix "build" config.networking.hostName) {
+    nix.gc.automatic = false;
+
+    systemd.services.free-space = {
+      serviceConfig.Type = "oneshot";
+      startAt = "hourly";
+      path = [
+        config.nix.package
+        pkgs.coreutils
+      ];
+      script = builtins.readFile "${inputs.self}/modules/shared/free-space.bash";
+    };
+
+    # Bump the open files limit so that non-root users can run NixOS VM tests
+    security.pam.loginLimits = [
+      {
+        domain = "*";
+        item = "nofile";
+        type = "-";
+        value = "20480";
+      }
+    ];
+  };
+}
diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix
@@ -9,6 +9,7 @@
     ../../shared/known-hosts.nix
     ../../shared/nix-daemon.nix
     ./agenix.nix
+    ./builder.nix
     ./security.nix
     ./sops-nix.nix
     ./telegraf.nix