From dd2d25b8929750d66345641928aa10f80f40f883 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 18 May 2024 20:44:02 +0200 Subject: move nix cache settings to nix.nix --- system/settings/configuration/nix.nix | 13 +++++++++++++ system/settings/programs/base.nix | 15 --------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix index 97cd7aeb..6e3cb061 100644 --- a/system/settings/configuration/nix.nix +++ b/system/settings/configuration/nix.nix @@ -12,6 +12,19 @@ keep-derivations = true; experimental-features = "nix-command flakes"; warn-dirty = false; + substituters = [ + "https://nix-community.cachix.org" + "https://deploy-rs.cachix.org" + "https://binarycache.alanpearce.eu" + "https://deploy-rs.cachix.org" + ]; + + trusted-public-keys = [ + "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI=" + "binarycache.alanpearce.eu:ZwqO3XMuajPictjwih8OY2+RXnOKpjZEZFHJjGSxAI4=" + ]; }; gc = { diff --git a/system/settings/programs/base.nix b/system/settings/programs/base.nix index bed3fd47..81a71a4b 100644 --- a/system/settings/programs/base.nix +++ b/system/settings/programs/base.nix @@ -9,19 +9,4 @@ ] ++ (lib.optionals (stdenv.isLinux) [ psmisc ]); - nix.settings = { - substituters = [ - "https://nix-community.cachix.org" - "https://deploy-rs.cachix.org" - "https://binarycache.alanpearce.eu" - "https://deploy-rs.cachix.org" - ]; - - trusted-public-keys = [ - "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI=" - "binarycache.alanpearce.eu:ZwqO3XMuajPictjwih8OY2+RXnOKpjZEZFHJjGSxAI4=" - ]; - }; } -- cgit 1.4.1