Migrate nix configuration into nix.settings
This removes the deprecation warnings from the nix module. The sandbox config is dropped on purpose, since the sandbox is enabled by default.
Martin Weinelt committed
Feb 13, 2024 at 18:02 UTC
1da892a14dabf05c153ac06ee3292be26fa266f4
3 files changed
+11
-8
delft/eris-physical.nix
+1
-1
@@ -50,7 +50,7 @@
50
boot.kernelModules = [ "kvm-intel" ];
51
boot.extraModulePackages = [ ];
52
53
- nix.maxJobs = lib.mkDefault 8;
53
+ nix.settings.max-jobs = lib.mkDefault 8;
54
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
55
})
56
];
delft/haumea-physical.nix
+1
-1
@@ -36,7 +36,7 @@
36
boot.kernelModules = [ "kvm-amd" ];
37
boot.extraModulePackages = [ ];
38
39
- nix.maxJobs = lib.mkDefault 16;
39
+ nix.settings.max-jobs = lib.mkDefault 16;
40
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
41
})
42
];
modules/common.nix
+9
-6
@@ -10,12 +10,15 @@ with lib;
10
users.extraUsers.root.openssh.authorizedKeys.keys =
11
with import ../ssh-keys.nix; infra-core;
12
13
- nix.useSandbox = true;
14
- nix.buildCores = 0;
15
- nix.extraOptions =
16
- ''
17
- experimental-features = nix-command flakes
18
- '';
13
+ nix = {
14
+ settings = {
15
+ cores = 0;
16
+ experimental-features = [
17
+ "nix-command"
18
+ "flakes"
19
+ ];
20
+ };
21
+ };
22
23
environment.systemPackages =
24
[ pkgs.emacs