refactor(nixpkgs): move nix settings into module

This commit is contained in:
2025-09-20 13:13:06 -06:00
parent d487bad132
commit 7758b10f55
4 changed files with 20 additions and 55 deletions

View File

@@ -116,21 +116,6 @@
}; };
}; };
nix = {
settings = {
trusted-users = [
"@wheel"
];
substituters = [
"https://nix-community.cachix.org"
"https://cache.nixos.org"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
};
# This option defines the first version of NixOS you have installed on this # This option defines the first version of NixOS you have installed on this
# particular machine, and is used to maintain compatibility with application # particular machine, and is used to maintain compatibility with application
# data (e.g. databases) created on older NixOS versions. # data (e.g. databases) created on older NixOS versions.

View File

@@ -107,26 +107,6 @@
settings.X11Forwarding = true; settings.X11Forwarding = true;
}; };
nix = {
settings = {
allow-import-from-derivation = true;
trusted-users = [
"@wheel"
];
substituters = [
"https://cache.deertopia.net"
"https://nix-community.cachix.org"
"https://cache.nixos.org"
"https://cache.iog.io"
];
trusted-public-keys = [
(builtins.readFile ../../public-keys/deertopia-cache.pub.pem)
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
];
};
};
security.pki.certificateFiles = [ security.pki.certificateFiles = [
../../public-keys/lolc.at.crt ../../public-keys/lolc.at.crt
]; ];

View File

@@ -127,26 +127,6 @@
settings.X11Forwarding = true; settings.X11Forwarding = true;
}; };
nix = {
settings = {
allow-import-from-derivation = true;
trusted-users = [
"@wheel"
];
substituters = [
"https://cache.deertopia.net"
"https://nix-community.cachix.org"
"https://cache.nixos.org"
"https://cache.iog.io"
];
trusted-public-keys = [
(builtins.readFile ../../public-keys/deertopia-cache.pub.pem)
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
];
};
};
security.pki.certificateFiles = [ security.pki.certificateFiles = [
../../public-keys/lolc.at.crt ../../public-keys/lolc.at.crt
]; ];

View File

@@ -10,5 +10,25 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = {
settings = {
allow-import-from-derivation = true;
trusted-users = [
"@wheel"
];
substituters = [
"https://cache.deertopia.net"
"https://nix-community.cachix.org"
"https://cache.nixos.org"
"https://cache.iog.io"
];
trusted-public-keys = [
(builtins.readFile ../../public-keys/deertopia-cache.pub.pem)
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
];
};
};
}; };
} }