diff options
| author | devhell <devhell@mailfresser.de> | 2022-02-01 13:12:15 +0000 |
|---|---|---|
| committer | devhell <devhell@mailfresser.de> | 2022-02-01 13:12:22 +0000 |
| commit | 813e40b6fc73d62ae215cd459468cae1200f2d0f (patch) | |
| tree | 7de88ba87df3d1f720847187a4cafc639f47f27c | |
| parent | 18cecf16a98af85c157c36816966937a0ed76e47 (diff) | |
Revert "treewide: rename nix.* to nix.settings.*"
This reverts commit 20ee65d79602b6412994dc52907715b274daeebe.
| -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, 5 insertions, 9 deletions
diff --git a/machines/devhell/herja.nix b/machines/devhell/herja.nix index c4f555ce..866a46ad 100644 --- a/machines/devhell/herja.nix +++ b/machines/devhell/herja.nix @@ -84,9 +84,7 @@ }; nix = { - settings = { - maxJobs = lib.mkDefault 8; - }; + maxJobs = lib.mkDefault 8; }; i18n = { diff --git a/modules/core/common.nix b/modules/core/common.nix index c13a701c..d05c54dd 100644 --- a/modules/core/common.nix +++ b/modules/core/common.nix @@ -44,8 +44,8 @@ in { vuizvui = import ../../pkgs { pkgs = super; }; }))); - nix.settings.binaryCaches = [ "https://headcounter.org/hydra/" ]; - nix.settings.binaryCachePublicKeys = [ + nix.binaryCaches = [ "https://headcounter.org/hydra/" ]; + nix.binaryCachePublicKeys = [ "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg=" ]; diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix index 598dc056..659f2e7e 100644 --- a/modules/user/devhell/profiles/base.nix +++ b/modules/user/devhell/profiles/base.nix @@ -15,10 +15,8 @@ in { }; nix = { - settings = { - buildCores = 0; - useSandbox = true; - }; + buildCores = 0; + useSandbox = true; extraOptions = '' auto-optimise-store = true experimental-features = nix-command flakes |