update to fix errors(new syntax)

This commit is contained in:
Mr Hedgehog 2022-01-31 12:34:42 -05:00
parent 96ef093477
commit 1d7754c97f
No known key found for this signature in database
GPG key ID: A5F69F6C161FDA7E
6 changed files with 25 additions and 22 deletions

View file

@ -8,5 +8,5 @@ let
(lib.filterAttrs filterCaches (builtins.readDir folder));
in {
inherit imports;
nix.binaryCaches = [ "https://cache.nixos.org/" ];
nix.settings.substituters = [ "https://cache.nixos.org/" ];
}

View file

@ -1,7 +1,7 @@
{
nix = {
binaryCaches = [ "https://nix-community.cachix.org" ];
binaryCachePublicKeys = [
nix.settings = {
substituters = [ "https://nix-community.cachix.org" ];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};

View file

@ -1,7 +1,7 @@
{
nix = {
binaryCaches = [ "https://nixpkgs-wayland.cachix.org" ];
binaryCachePublicKeys = [
nix.settings = {
substituters = [ "https://nixpkgs-wayland.cachix.org" ];
trusted-public-keys = [
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
];
};

View file

@ -1,7 +1,7 @@
{
nix = {
binaryCaches = [ "https://nrdxp.cachix.org" ];
binaryCachePublicKeys =
nix.settings = {
substituters = [ "https://nrdxp.cachix.org" ];
trusted-public-keys =
[ "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4=" ];
};
}

View file

@ -1,7 +1,7 @@
{
nix = {
binaryCaches = [ "https://statix.cachix.org" ];
binaryCachePublicKeys =
nix.settings = {
substituters = [ "https://statix.cachix.org" ];
trusted-public-keys =
[ "statix.cachix.org-1:Z9E/g1YjCjU117QOOt07OjhljCoRZddiAm4VVESvais=" ];
};
}

View file

@ -3,8 +3,6 @@ let inherit (lib) fileContents;
in {
imports = [ ../cachix ];
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
environment = {
systemPackages = with pkgs; [
@ -99,19 +97,24 @@ in {
};
nix = {
settings = {
autoOptimiseStore = true;
sandbox = true;
allowed-users = [ "@wheel" ];
trusted-users = [ "root" "@wheel" ];
auto-optimise-store = true;
system-feature = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
};
gc.automatic = true;
optimise.automatic = true;
useSandbox = true;
allowedUsers = [ "@wheel" ];
trustedUsers = [ "root" "@wheel" ];
extraOptions = ''
min-free = 536870912
keep-outputs = true