nixos: use new nix options

5 files changed, 9 insertions, 9 deletions

diff --git a/nixos/alpha/hardware-configuration.nix b/nixos/alpha/hardware-configuration.nix
index 51e30a7..10f0514 100644
--- a/nixos/alpha/hardware-configuration.nix
+++ b/nixos/alpha/hardware-configuration.nix
@@ -66,6 +66,6 @@
 
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil";
 }
diff --git a/nixos/modules/cachix/caches/chaotic-nixpkgs.nix b/nixos/modules/cachix/caches/chaotic-nixpkgs.nix
index 7131c9b..d6c9844 100644
--- a/nixos/modules/cachix/caches/chaotic-nixpkgs.nix
+++ b/nixos/modules/cachix/caches/chaotic-nixpkgs.nix
@@ -1,11 +1,11 @@
 { config, lib, ... }:
 
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://chaotic-nixpkgs.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "chaotic-nixpkgs.cachix.org-1:xm/PZVLgwIlMc8K5+ZxGIkEXovfL9Bll5HolvzN1wIQ="
     ];
   };
diff --git a/nixos/modules/cachix/caches/nix-community.nix b/nixos/modules/cachix/caches/nix-community.nix
index 2b4c408..d323939 100644
--- a/nixos/modules/cachix/caches/nix-community.nix
+++ b/nixos/modules/cachix/caches/nix-community.nix
@@ -1,11 +1,11 @@
 { config, lib, ... }:
 
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://nix-community.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };
diff --git a/nixos/modules/cachix/default.nix b/nixos/modules/cachix/default.nix
index 38ad575..9dd55b5 100644
--- a/nixos/modules/cachix/default.nix
+++ b/nixos/modules/cachix/default.nix
@@ -7,7 +7,7 @@ let
 in
 {
   inherit imports;
-  nix.binaryCaches = [ "https://cache.nixos.org/" ];
+  nix.settings.substituters = [ "https://cache.nixos.org/" ];
 
   environment.systemPackages = [ pkgs.cachix ];
 }
diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix
index 04fafac..1f61d45 100644
--- a/nixos/modules/nix.nix
+++ b/nixos/modules/nix.nix
@@ -25,7 +25,7 @@ in
   config = lib.mkMerge [
     (lib.mkIf (config.nix.experimentalFeatures != "") { nix.extraOptions = "experimental-features = ${config.nix.experimentalFeatures}"; })
     (lib.mkIf (allowed != [ ]) { nixpkgs.config.allowUnfreePredicate = (pkg: __elem (lib.getName pkg) allowed); })
-    { nix.autoOptimiseStore = lib.mkDefault true; }
+    { nix.settings.auto-optimise-store = lib.mkDefault true; }
     {
       nix.gc.automatic = lib.mkDefault true;
       nix.gc.options = lib.mkDefault "--delete-older-than 10d";