modules/nixos: move cgroups to common/builder

nix-community · Feb 8, 2025 · 088c78c · 088c78c
1 parent 8dddbe3
commit 088c78c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 26 deletions.
diff --git a/hosts/build01/default.nix b/hosts/build01/default.nix
@@ -1,7 +1,6 @@
 { inputs, ... }:
 {
   imports = [
-    inputs.self.nixosModules.cgroups
     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
@@ -5,7 +5,6 @@
     ./nixpkgs-update-backup.nix
     ./nixpkgs-update-cache.nix
     ./nixpkgs-update.nix
-    inputs.self.nixosModules.cgroups
     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.cgroups
     inputs.self.nixosModules.ci-builder
     inputs.self.nixosModules.disko-zfs
     inputs.self.nixosModules.github-org-backup

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

diff --git a/hosts/build05/default.nix b/hosts/build05/default.nix
@@ -1,7 +1,6 @@
 { inputs, ... }:
 {
   imports = [
-    inputs.self.nixosModules.cgroups
     inputs.self.nixosModules.community-builder
     inputs.self.nixosModules.disko-zfs
     inputs.srvos.nixosModules.hardware-hetzner-online-arm

diff --git a/modules/nixos/cgroups.nix b/modules/nixos/cgroups.nix
diff --git a/modules/nixos/common/builder.nix b/modules/nixos/common/builder.nix
@@ -24,6 +24,18 @@
       script = builtins.readFile "${inputs.self}/modules/shared/free-space.bash";
     };
 
+    nix.package = pkgs.nixVersions.nix_2_25;
+
+    nix.settings = {
+      experimental-features = [
+        "auto-allocate-uids"
+        "cgroups"
+      ];
+
+      auto-allocate-uids = true;
+      use-cgroups = true;
+    };
+
     nix.settings.extra-platforms = lib.mkIf (config.nixpkgs.hostPlatform.system == "x86_64-linux") [
       (lib.mkIf (config.boot.binfmt.emulatedSystems == [ ]) "i686-linux")
       "x86_64-v1-linux"
@@ -38,6 +50,7 @@
         "big-parallel"
         "kvm"
         "nixos-test"
+        "uid-range"
         "gccarch-${config.nixpkgs.hostPlatform.gcc.arch}"
       ]
       ++ map (x: "gccarch-${x}") (