From fb766a7d2214ce6aeb7bc0e43eacb0dd820201ab Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 22 Sep 2022 02:08:17 +0200 Subject: [PATCH] config/c3d2, modules/microvm-host: update outdated nix.settings --- config/c3d2.nix | 16 +++++++++------- modules/microvm-host.nix | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/config/c3d2.nix b/config/c3d2.nix index 87c1254d..ba6370ac 100644 --- a/config/c3d2.nix +++ b/config/c3d2.nix @@ -151,13 +151,15 @@ in { }; nix = { - autoOptimiseStore = true; - binaryCachePublicKeys = lib.mkIf (config.networking.hostName != "hydra") [ - (builtins.readFile ../hosts/hydra/cache-pub.key) - ]; - binaryCaches = lib.mkIf (config.networking.hostName != "hydra") ( - lib.mkBefore [ "https://hydra.hq.c3d2.de" ] - ); + settings = { + auto-optimise-store = true; + trusted-public-keys = lib.mkIf (config.networking.hostName != "hydra") [ + (builtins.readFile ../hosts/hydra/cache-pub.key) + ]; + substituters = lib.mkIf (config.networking.hostName != "hydra") ( + lib.mkBefore [ "https://hydra.hq.c3d2.de" ] + ); + }; gc = { automatic = true; dates = "06:00"; diff --git a/modules/microvm-host.nix b/modules/microvm-host.nix index ac454ee2..d471931d 100644 --- a/modules/microvm-host.nix +++ b/modules/microvm-host.nix @@ -58,12 +58,12 @@ ''; }; - nix = { + nix.settings = { # fetch github-prebuilt microvm-kernels - binaryCaches = [ + substituters = [ "https://microvm.cachix.org" ]; - binaryCachePublicKeys = [ + trusted-public-keys = [ "microvm.cachix.org-1:oXnBc6hRE3eX5rSYdRyMYXnfzcCxC7yKPTbZXALsqys=" ]; };