diff options
| author | tv <tv@krebsco.de> | 2022-12-05 16:54:54 +0100 | 
|---|---|---|
| committer | tv <tv@krebsco.de> | 2022-12-05 17:43:11 +0100 | 
| commit | 6a82f294335cbc0991f7a95355adfb9f7b7e6f43 (patch) | |
| tree | 77226adf7a5eb7f953254fcff146fb1bcb75d24e | |
| parent | dfd8f1f93c492eb33de6d3642248b3f504ac4742 (diff) | |
tv: use nix.settings
| -rw-r--r-- | tv/2configs/default.nix | 13 | ||||
| -rw-r--r-- | tv/2configs/hw/x220.nix | 4 | 
2 files changed, 7 insertions, 10 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 41dab525a..c9047023e 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -46,18 +46,15 @@ with import <stockholm/lib>;      }      { -      # TODO check if both are required: -      nix.sandboxPaths = [ "/etc/protocols" pkgs.iana-etc.outPath ]; - -      nix.requireSignedBinaryCaches = true; - -      nix.binaryCaches = ["https://cache.nixos.org"]; -        nix.extraOptions = ''          auto-optimise-store = true        ''; -      nix.useSandbox = true; +      # TODO check if both are required: +      nix.settings.extra-sandbox-paths = [ +        "/etc/protocols" +        pkgs.iana-etc.outPath +      ];      }      {        nixpkgs.config.allowUnfree = false; diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index 8c68cdef0..25e2effbd 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -28,8 +28,8 @@ in      }      { -      nix.buildCores = 2; -      nix.maxJobs = 2; +      nix.settings.cores = 2; +      nix.settings.max-jobs = 2;      }      (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then {        nix.daemonCPUSchedPolicy = "batch";  | 
