upgrade to 22.05-pre

2 files changed, 7 insertions, 11 deletions

diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
index 77e3ffb..66b5bdc 100644
--- a/hosts/olive/configuration.nix
+++ b/hosts/olive/configuration.nix
@@ -1,7 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { config, pkgs, lib, self, ... }:
 
 {
@@ -132,14 +128,14 @@
       keep-outputs = false
       keep-derivations = true
     '';
+    settings = {
+      trusted-users = [
+        "root"
+        "np"
+      ];
+    };
   };
 
-  nix.trustedUsers =
-    [
-      "root"
-      "np"
-    ];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/olive/hardware-configuration.nix b/hosts/olive/hardware-configuration.nix
index fc9ccb8..c2bff39 100644
--- a/hosts/olive/hardware-configuration.nix
+++ b/hosts/olive/hardware-configuration.nix
@@ -31,6 +31,6 @@
 
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 8;
+  nix.settings.max-jobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }