From 3a292a23130db25932a6ceec755e1bb19487e5d3 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 3 Oct 2022 00:01:54 +0200
Subject: Update to nix-darwin unstable on mba

---
 system/mba.nix                    |  6 ++++--
 system/settings/darwin.nix        | 11 ++++-------
 system/settings/programs/base.nix |  6 +++---
 user/settings/darwin.nix          |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/system/mba.nix b/system/mba.nix
index e8d69490..6a896895 100644
--- a/system/mba.nix
+++ b/system/mba.nix
@@ -27,7 +27,9 @@
 
   # You should generally set this to the total number of logical cores in your system.
   # $ sysctl -n hw.ncpu
-  nix.maxJobs = 8;
-  nix.buildCores = 4;
+  nix.settings = {
+    max-jobs = 8;
+    cores = 4;
+  };
 }
 # vim: sw=2 sts=2 expandtab autoindent smarttab
diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix
index 2761817e..62859e7e 100644
--- a/system/settings/darwin.nix
+++ b/system/settings/darwin.nix
@@ -6,20 +6,17 @@
     enableSocketListener = true;
   };
   nix = {
-    buildCores = lib.mkDefault 0;
-    daemonIONice = true;
-    daemonNiceLevel = 10;
+    settings.cores = lib.mkDefault 0;
+    daemonIOLowPriority = true;
     gc = {
       automatic = true;
       user = "alan";
       options = "--max-freed $((25 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | awk '{ print $4 }')))";
     };
-    extraOptions = ''
-      system = x86_64-darwin
-      extra-platforms = x64_64-darwin aarch64-darwin
-    '';
+    settings.extra-platforms = "x86_64-darwin aarch64-darwin";
   };
 
+  nixpkgs.system = "x86_64-darwin";
   nixpkgs.config = {
     allowUnfree = true;
   };
diff --git a/system/settings/programs/base.nix b/system/settings/programs/base.nix
index bdf240f1..6177cbb4 100644
--- a/system/settings/programs/base.nix
+++ b/system/settings/programs/base.nix
@@ -6,8 +6,8 @@
     vim
     zstd
   ];
-  nix = {
-    binaryCaches = ["https://nix-community.cachix.org"];
-    binaryCachePublicKeys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
+  nix.settings = {
+    trusted-substituters = ["https://nix-community.cachix.org"];
+    trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
   };
 }
diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix
index 0279fc54..285df8ea 100644
--- a/user/settings/darwin.nix
+++ b/user/settings/darwin.nix
@@ -3,7 +3,7 @@
 {
   nixpkgs.overlays = [
     (self: super: {
-      darwin-zsh-completions = super.runCommandNoCC "darwin-zsh-completions-0.0.0"
+      darwin-zsh-completions = super.runCommand "darwin-zsh-completions-0.0.0"
         { preferLocalBuild = true; }
         ''
           mkdir -p $out/share/zsh/site-functions
-- 
cgit 1.4.1