From 20262fbd099c53c9a868ac2bf5479697b351be5e Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Fri, 16 Jun 2023 02:11:20 +0300 Subject: [PATCH] change nix settings for iso --- machines/Flakes-ISO/default.nix | 24 +++++++++++++++++++++++- profiles/overlay.nix | 1 - 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/machines/Flakes-ISO/default.nix b/machines/Flakes-ISO/default.nix index 149b96e..9b9680e 100644 --- a/machines/Flakes-ISO/default.nix +++ b/machines/Flakes-ISO/default.nix @@ -30,12 +30,34 @@ experimental-features = nix-command flakes flake-registry = ${inputs.flake-registry}/flake-registry.json ''; + settings = { + require-sigs = true; + substituters = [ + "https://cache.nixos.org" + "https://nix-community.cachix.org" + "https://nixpkgs-wayland.cachix.org" + "https://hyprland.cachix.org" + "https://ataraxiadev-foss.cachix.org" + "https://cache.ataraxiadev.com/ataraxiadev" + "https://numtide.cachix.org" + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "ataraxiadev-foss.cachix.org-1:ws/jmPRUF5R8TkirnV1b525lP9F/uTBsz2KraV61058=" + "ataraxiadev:V/fCdvz1bMsQzYZcLltcAULST+MoChv53EfedmyJ8Uw=" + "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" + ]; + trusted-users = [ "root" config.mainuser "@wheel" ]; + }; buildMachines = [{ hostName = "nix-builder"; maxJobs = 8; sshUser = "ataraxia"; sshKey = "/home/nixos/ssh-builder"; - systems = [ "x86_64-linux" "i686-linux" ]; + systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; }]; distributedBuilds = true; diff --git a/profiles/overlay.nix b/profiles/overlay.nix index 85d70fa..569aeca 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -7,7 +7,6 @@ let }; nur = import inputs.nur { nurpkgs = import inputs.nixpkgs { - # inherit system; system = "x86_64-linux"; }; };