From f9f17b59a75050a5e7dcbda0fd244ae45d291acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 19 Jul 2022 22:00:36 +0200
Subject: [PATCH] feat: use new nix options

---
 configs/nix.nix                            | 20 +++++++++++---------
 systems/kabsa/configuration.nix            |  6 +++---
 systems/kabsa/hardware-configuration.nix   |  2 +-
 systems/makanek/hardware-configuration.nix |  2 +-
 systems/zaatar/hardware-configuration.nix  |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/configs/nix.nix b/configs/nix.nix
index 84debd2..6c60884 100644
--- a/configs/nix.nix
+++ b/configs/nix.nix
@@ -9,14 +9,16 @@
   nix = {
     package = pkgs.nixUnstable;
     extraOptions = "experimental-features = nix-command flakes";
-    binaryCaches = [
-      "http://cache.prism.r"
-      "https://cache.nixos.org/"
-    ];
-    binaryCachePublicKeys = [
-      "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
-      "cache.prism-2:YwmCm3/s/D+SxrPKN/ETjlpw/219pNUbpnluatp6FKI="
-      "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
-    ];
+    settings = {
+      substituters = [
+        "http://cache.prism.r"
+        "https://cache.nixos.org/"
+      ];
+      trusted-public-keys = [
+        "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
+        "cache.prism-2:YwmCm3/s/D+SxrPKN/ETjlpw/219pNUbpnluatp6FKI="
+        "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
+      ];
+    };
   };
 }
diff --git a/systems/kabsa/configuration.nix b/systems/kabsa/configuration.nix
index 5083295..dc2a47a 100644
--- a/systems/kabsa/configuration.nix
+++ b/systems/kabsa/configuration.nix
@@ -19,9 +19,9 @@ in {
     promptColours.success = "cyan";
   };
 
-  nix = {
-    buildCores = 1;
-    maxJobs = 2;
+  nix.settings = {
+    cores = 1;
+    max-jobs = 2;
   };
 
   environment.systemPackages = [pkgs.minecraft];
diff --git a/systems/kabsa/hardware-configuration.nix b/systems/kabsa/hardware-configuration.nix
index 970aa80..197ab24 100644
--- a/systems/kabsa/hardware-configuration.nix
+++ b/systems/kabsa/hardware-configuration.nix
@@ -42,6 +42,6 @@
 
   zramSwap.enable = false;
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }
diff --git a/systems/makanek/hardware-configuration.nix b/systems/makanek/hardware-configuration.nix
index 3330999..19d99fc 100644
--- a/systems/makanek/hardware-configuration.nix
+++ b/systems/makanek/hardware-configuration.nix
@@ -29,5 +29,5 @@
   swapDevices = [];
   zramSwap.enable = true;
 
-  nix.maxJobs = lib.mkDefault 2;
+  nix.settings.max-jobs = lib.mkDefault 2;
 }
diff --git a/systems/zaatar/hardware-configuration.nix b/systems/zaatar/hardware-configuration.nix
index ba8a214..4cf8671 100644
--- a/systems/zaatar/hardware-configuration.nix
+++ b/systems/zaatar/hardware-configuration.nix
@@ -32,6 +32,6 @@
 
   swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }