erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

nix: Use nix.settings and remove extraOptions

Browse source
This commit is contained in:
Erwin Boskma 2024-01-17 09:41:56 +01:00
parent 0793b93a0a
commit 06063203bc
Signed by: erwin
SSH key fingerprint: SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/nix-common/default.nix
View file

@ -29,9 +29,6 @@ in
nix = { nix = {
package = pkgs.nixVersions.unstable; package = pkgs.nixVersions.unstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
buildMachines = mkIf cfg.remote-builders [ buildMachines = mkIf cfg.remote-builders [
{ {
@ -52,12 +49,19 @@ in
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://marcus7070.cachix.org" "https://marcus7070.cachix.org"
"https://devenv.cachix.org" "https://devenv.cachix.org"
"https://elixir-tools.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"marcus7070.cachix.org-1:JawxHSgnYsgNYJmNqZwvLjI4NcOwrcEZDToWlT3WwXw=" "marcus7070.cachix.org-1:JawxHSgnYsgNYJmNqZwvLjI4NcOwrcEZDToWlT3WwXw="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
"elixir-tools.cachix.org-1:GfK9E139Ysi+YWeS1oNN9OaTfQjqpLwlBaz+/73tBjU="
];
experimental-features = [
"nix-command"
"flakes"
"auto-allocate-uids"
]; ];
}; };