From aaa994137a89ab9d37fb83091dc7d24937898491 Mon Sep 17 00:00:00 2001 From: sterni Date: Thu, 25 Aug 2022 14:54:32 +0200 Subject: fix: reflect renames of Nix configuration options Change-Id: I7e28ac3d71acd7d99a1d3ef97bef9422097e4abf Reviewed-on: https://cl.tvl.fyi/c/depot/+/6154 Tested-by: BuildkiteCI Reviewed-by: tazjin --- users/tazjin/nixos/camden/default.nix | 12 +++++------- users/tazjin/nixos/frog/default.nix | 8 ++++---- users/tazjin/nixos/modules/home-config.nix | 4 +--- 3 files changed, 10 insertions(+), 14 deletions(-) (limited to 'users') diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix index 6568d6341e..cdda1dcedc 100644 --- a/users/tazjin/nixos/camden/default.nix +++ b/users/tazjin/nixos/camden/default.nix @@ -74,16 +74,14 @@ lib.fix (self: { }; }; - nix = { - maxJobs = lib.mkDefault 4; - - trustedUsers = [ "root" "tazjin" ]; - - binaryCaches = [ + nix.settings = { + max-jobs = lib.mkDefault 4; + trusted-users = [ "root" "tazjin" ]; + substituters = [ "https://tazjin.cachix.org" ]; - binaryCachePublicKeys = [ + trusted-public-keys = [ "tazjin.cachix.org-1:IZkgLeqfOr1kAZjypItHMg1NoBjm4zX9Zzep8oRSh7U=" ]; }; diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 35d7f9c775..1400517eec 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -61,10 +61,10 @@ lib.fix (self: { }; }; - nix = { - maxJobs = 48; - binaryCaches = [ "ssh://nix-ssh@whitby.tvl.fyi" ]; - binaryCachePublicKeys = [ "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" ]; + nix.settings = { + max-jobs = 48; + substituters = [ "ssh://nix-ssh@whitby.tvl.fyi" ]; + trusted-public-keys = [ "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" ]; }; networking = { diff --git a/users/tazjin/nixos/modules/home-config.nix b/users/tazjin/nixos/modules/home-config.nix index 6157f2850d..bda8f7a440 100644 --- a/users/tazjin/nixos/modules/home-config.nix +++ b/users/tazjin/nixos/modules/home-config.nix @@ -12,9 +12,7 @@ initialHashedPassword = "$2b$05$1eBPdoIgan/C/L8JFqIHBuVscQyTKw1L/4VBlzlLvLBEf6CXS3EW6"; }; - nix = { - trustedUsers = [ "tazjin" ]; - }; + nix.settings.trusted-users = [ "tazjin" ]; home-manager.useGlobalPkgs = true; home-manager.users.tazjin = depot.users.tazjin.home."${config.networking.hostName}"; -- cgit 1.4.1