From 418444853c04108a05ead1c820acda204d060724 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 18 Jan 2023 17:14:52 +0100 Subject: [PATCH] nixos-module/{,container/}defaults: update to nix.settings --- nix/nixos-module/container/defaults.nix | 8 +++++--- nix/nixos-module/defaults.nix | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nix/nixos-module/container/defaults.nix b/nix/nixos-module/container/defaults.nix index dbbe16c..2eaf2e5 100644 --- a/nix/nixos-module/container/defaults.nix +++ b/nix/nixos-module/container/defaults.nix @@ -19,9 +19,11 @@ ); nix = { - useSandbox = false; - maxJobs = lib.mkDefault 1; - buildCores = lib.mkDefault 1; + settings = { + sandbox = false; + max-jobs = lib.mkDefault 4; + cores = lib.mkDefault 4; + }; }; systemd.services = diff --git a/nix/nixos-module/defaults.nix b/nix/nixos-module/defaults.nix index 62324d7..51563e2 100644 --- a/nix/nixos-module/defaults.nix +++ b/nix/nixos-module/defaults.nix @@ -26,10 +26,12 @@ nixpkgs.flake = inputs.nixpkgs; }; - binaryCachePublicKeys = [ - "nix-serve.hq.c3d2.de:KZRGGnwOYzys6pxgM8jlur36RmkJQ/y8y62e52fj1ps=%" - ]; - binaryCaches = lib.mkBefore [ "https://hydra.hq.c3d2.de" ]; + settings = { + substituters = lib.mkBefore [ "https://hydra.hq.c3d2.de" ]; + trusted-public-keys = [ + "nix-serve.hq.c3d2.de:KZRGGnwOYzys6pxgM8jlur36RmkJQ/y8y62e52fj1ps=%" + ]; + }; }; documentation = {