From 6a82f294335cbc0991f7a95355adfb9f7b7e6f43 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 5 Dec 2022 16:54:54 +0100
Subject: tv: use nix.settings

---
 tv/2configs/default.nix | 13 +++++--------
 tv/2configs/hw/x220.nix |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 41dab525a..c9047023e 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -46,18 +46,15 @@ with import <stockholm/lib>;
     }
 
     {
-      # TODO check if both are required:
-      nix.sandboxPaths = [ "/etc/protocols" pkgs.iana-etc.outPath ];
-
-      nix.requireSignedBinaryCaches = true;
-
-      nix.binaryCaches = ["https://cache.nixos.org"];
-
       nix.extraOptions = ''
         auto-optimise-store = true
       '';
 
-      nix.useSandbox = true;
+      # TODO check if both are required:
+      nix.settings.extra-sandbox-paths = [
+        "/etc/protocols"
+        pkgs.iana-etc.outPath
+      ];
     }
     {
       nixpkgs.config.allowUnfree = false;
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index 8c68cdef0..25e2effbd 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -28,8 +28,8 @@ in
     }
 
     {
-      nix.buildCores = 2;
-      nix.maxJobs = 2;
+      nix.settings.cores = 2;
+      nix.settings.max-jobs = 2;
     }
     (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then {
       nix.daemonCPUSchedPolicy = "batch";
-- 
cgit v1.2.3