From f3066d24614ce445c3772ae8c73b96ec81c429c1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 2 Feb 2022 12:02:01 +0100 Subject: machines/sternenseemann: fix nix option rename warnings --- machines/sternenseemann/base.nix | 10 +++++----- machines/sternenseemann/user-lukas.nix | 2 +- machines/sternenseemann/wolfgang.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'machines/sternenseemann') diff --git a/machines/sternenseemann/base.nix b/machines/sternenseemann/base.nix index c6091175..8d8d7c94 100644 --- a/machines/sternenseemann/base.nix +++ b/machines/sternenseemann/base.nix @@ -17,11 +17,11 @@ in { nix = { # new --show-trace is so noisy, I wouldn't be able to debug something to save my life package = pkgs.nix_2_3; - useSandbox = true; - extraOptions = '' - gc-keep-derivations = false - builders-use-substitutes = true - ''; + settings = { + sandbox = true; + gc-keep-derivations = false; + builders-use-substitutes = true; + }; }; nixpkgs.config.allowUnfree = true; diff --git a/machines/sternenseemann/user-lukas.nix b/machines/sternenseemann/user-lukas.nix index c73adcef..40b16472 100644 --- a/machines/sternenseemann/user-lukas.nix +++ b/machines/sternenseemann/user-lukas.nix @@ -2,7 +2,7 @@ { config = { - nix.trustedUsers = [ "lukas" ]; + nix.settings.trusted-users = [ "lukas" ]; users.users.lukas = { isNormalUser = true; uid = 1000; diff --git a/machines/sternenseemann/wolfgang.nix b/machines/sternenseemann/wolfgang.nix index eaa515c1..5073b5fc 100644 --- a/machines/sternenseemann/wolfgang.nix +++ b/machines/sternenseemann/wolfgang.nix @@ -41,7 +41,7 @@ in { { device = "/dev/disk/by-uuid/198329ed-5038-4ad8-b8a6-e52921f2673d"; } ]; - nix.maxJobs = 4; + nix.settings.max-jobs = 4; boot.initrd.luks.devices = { "main".device = "/dev/nvme0n1p2"; -- cgit 1.4.1