From 62824c992a0c3371c4701e6d3080721811950b02 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 16 Mar 2022 17:25:28 +0100 Subject: machines/Profpatsch: fix new nix settings names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s only checked at the end LOL --- machines/profpatsch/base.nix | 4 ++-- machines/profpatsch/shiki.nix | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'machines') diff --git a/machines/profpatsch/base.nix b/machines/profpatsch/base.nix index e4dc4e00..4232e4d5 100644 --- a/machines/profpatsch/base.nix +++ b/machines/profpatsch/base.nix @@ -10,9 +10,9 @@ in { config = { # correctness before speed - nix.settings.useSandbox = true; + nix.settings.sandbox = true; - nix.settings.maxJobs = "auto"; + nix.settings.max-jobs = "auto"; # /tmp should never be depended on boot.cleanTmpDir = true; diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix index 23c66cf4..431114fa 100644 --- a/machines/profpatsch/shiki.nix +++ b/machines/profpatsch/shiki.nix @@ -103,7 +103,7 @@ in { ]; nix.distributedBuilds = true; - nix.settings.trustedUsers = [ "@wheel" ]; + nix.settings.trusted-users = [ "@wheel" ]; nix.buildMachines = [ # access to the nix-community aarch64 build box { @@ -124,10 +124,10 @@ in { supportedFeatures = [ "kvm" "big-parallel" "nixos-test" "benchmark" ]; } ]; - nix.settings.binaryCaches = [ + nix.settings.substituters = [ "https://digitallyinduced.cachix.org" ]; - nix.settings.binaryCachePublicKeys = [ + nix.settings.trusted-public-keys = [ "digitallyinduced.cachix.org-1:y+wQvrnxQ+PdEsCt91rmvv39qRCYzEgGQaldK26hCKE=" ]; @@ -336,6 +336,7 @@ in { # vuizvui.services.guix.enable = true; + ################### # Graphical System -- cgit 1.4.1