mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: reflect renames of Nix configuration options

Browse source 
Change-Id: I7e28ac3d71acd7d99a1d3ef97bef9422097e4abf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6154
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2022-08-25 14:54:32 +02:00
parent 0c4c307926
commit aaa994137a
5 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ops/machines/whitby/default.nix
View file

@ -184,17 +184,17 @@ in
nix = { nix = {
nrBuildUsers = 256; nrBuildUsers = 256;
maxJobs = lib.mkDefault 64; settings = {
extraOptions = '' max-jobs = lib.mkDefault 64;
secret-key-files = /run/agenix/nix-cache-priv secret-key-files = "/run/agenix/nix-cache-priv";
'';
trustedUsers = [ trusted-users = [
"grfn" "grfn"
"lukegb" "lukegb"
"tazjin" "tazjin"
"sterni" "sterni"
]; ];
};
sshServe = { sshServe = {
enable = true; enable = true;

6
ops/modules/tvl-cache.nix
View file

@ -6,12 +6,12 @@
}; };
config = lib.mkIf config.tvl.cache.enable { config = lib.mkIf config.tvl.cache.enable {
nix = { nix.settings = {
binaryCachePublicKeys = [ trusted-public-keys = [
"cache.tvl.su:kjc6KOMupXc1vHVufJUoDUYeLzbwSr9abcAKdn/U1Jk=" "cache.tvl.su:kjc6KOMupXc1vHVufJUoDUYeLzbwSr9abcAKdn/U1Jk="
]; ];
binaryCaches = [ substituters = [
"https://cache.tvl.su" "https://cache.tvl.su"
]; ];
}; };

12
users/tazjin/nixos/camden/default.nix
View file

@ -74,16 +74,14 @@ lib.fix (self: {
}; };
}; };
nix = { nix.settings = {
maxJobs = lib.mkDefault 4; max-jobs = lib.mkDefault 4;
trusted-users = [ "root" "tazjin" ];
trustedUsers = [ "root" "tazjin" ]; substituters = [
binaryCaches = [
"https://tazjin.cachix.org" "https://tazjin.cachix.org"
]; ];
binaryCachePublicKeys = [ trusted-public-keys = [
"tazjin.cachix.org-1:IZkgLeqfOr1kAZjypItHMg1NoBjm4zX9Zzep8oRSh7U=" "tazjin.cachix.org-1:IZkgLeqfOr1kAZjypItHMg1NoBjm4zX9Zzep8oRSh7U="
]; ];
}; };

8
users/tazjin/nixos/frog/default.nix
View file

@ -61,10 +61,10 @@ lib.fix (self: {
}; };
}; };
nix = { nix.settings = {
maxJobs = 48; max-jobs = 48;
binaryCaches = [ "ssh://nix-ssh@whitby.tvl.fyi" ]; substituters = [ "ssh://nix-ssh@whitby.tvl.fyi" ];
binaryCachePublicKeys = [ "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" ]; trusted-public-keys = [ "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" ];
}; };
networking = { networking = {

4
users/tazjin/nixos/modules/home-config.nix
View file

@ -12,9 +12,7 @@
initialHashedPassword = "$2b$05$1eBPdoIgan/C/L8JFqIHBuVscQyTKw1L/4VBlzlLvLBEf6CXS3EW6"; initialHashedPassword = "$2b$05$1eBPdoIgan/C/L8JFqIHBuVscQyTKw1L/4VBlzlLvLBEf6CXS3EW6";
}; };
nix = { nix.settings.trusted-users = [ "tazjin" ];
trustedUsers = [ "tazjin" ];
};
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.tazjin = depot.users.tazjin.home."${config.networking.hostName}"; home-manager.users.tazjin = depot.users.tazjin.home."${config.networking.hostName}";