diff options
| author | devhell <devhell@mailfresser.de> | 2022-01-30 15:05:25 +0000 |
|---|---|---|
| committer | devhell <devhell@mailfresser.de> | 2022-01-30 15:05:25 +0000 |
| commit | 20ee65d79602b6412994dc52907715b274daeebe (patch) | |
| tree | 27fa5de18007f8a73fa77fb1f4b4186e68ae25b1 | |
| parent | 3c43933270cc0d112a1f33f4ecf905d181cb33e2 (diff) | |
treewide: rename nix.* to nix.settings.*
This must have been a recent change where an assert is now thrown because some nix.* settings have been regrouped as nix.settings.*
| -rw-r--r-- | machines/devhell/herja.nix | 4 | ||||
| -rw-r--r-- | modules/core/common.nix | 4 | ||||
| -rw-r--r-- | modules/user/devhell/profiles/base.nix | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/machines/devhell/herja.nix b/machines/devhell/herja.nix index 866a46ad..c4f555ce 100644 --- a/machines/devhell/herja.nix +++ b/machines/devhell/herja.nix @@ -84,7 +84,9 @@ }; nix = { - maxJobs = lib.mkDefault 8; + settings = { + maxJobs = lib.mkDefault 8; + }; }; i18n = { diff --git a/modules/core/common.nix b/modules/core/common.nix index d05c54dd..c13a701c 100644 --- a/modules/core/common.nix +++ b/modules/core/common.nix @@ -44,8 +44,8 @@ in { vuizvui = import ../../pkgs { pkgs = super; }; }))); - nix.binaryCaches = [ "https://headcounter.org/hydra/" ]; - nix.binaryCachePublicKeys = [ + nix.settings.binaryCaches = [ "https://headcounter.org/hydra/" ]; + nix.settings.binaryCachePublicKeys = [ "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg=" ]; diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix index 659f2e7e..598dc056 100644 --- a/modules/user/devhell/profiles/base.nix +++ b/modules/user/devhell/profiles/base.nix @@ -15,8 +15,10 @@ in { }; nix = { - buildCores = 0; - useSandbox = true; + settings = { + buildCores = 0; + useSandbox = true; + }; extraOptions = '' auto-optimise-store = true experimental-features = nix-command flakes |