diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2022-12-01 08:46:14 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2022-12-01 08:46:14 -0500 |
| commit | b5efaa433c1c6f53413b0443a18c1aea95bd2215 (patch) | |
| tree | a33278d68cb11db5218d5f77b2dd4843f5050caa /machines | |
| parent | 0a15752e6d5d0ab291afecf6cb2baf75c045167d (diff) | |
Update nixos
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/dragon.nix | 4 | ||||
| -rw-r--r-- | machines/x1-pincer.nix | 1 | ||||
| -rw-r--r-- | machines/x220-aji.nix | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/machines/dragon.nix b/machines/dragon.nix index b892f49..7ddcb02 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -131,8 +131,8 @@ in { swapDevices = [ ]; - nix.trustedUsers = [ "builder" ]; - nix.maxJobs = lib.mkDefault 8; + nix.settings.trusted-users = [ "builder" ]; + nix.settings.max-jobs = lib.mkDefault 8; powerManagement.cpuFreqGovernor = "ondemand"; hardware.enableRedistributableFirmware = lib.mkDefault true; } diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix index 7f8fe96..7c6ab47 100644 --- a/machines/x1-pincer.nix +++ b/machines/x1-pincer.nix @@ -139,7 +139,6 @@ let ports = { # hardware-configuration.nix boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" ]; - nix.maxJobs = lib.mkDefault 4; hardware.enableRedistributableFirmware = lib.mkDefault true; system.stateVersion = "17.04"; } diff --git a/machines/x220-aji.nix b/machines/x220-aji.nix index b05f16a..6f02a42 100644 --- a/machines/x220-aji.nix +++ b/machines/x220-aji.nix @@ -2,7 +2,6 @@ { imports = [ ../config/desktop.nix - ../config/laptop.nix ../config/thinkpad.nix ../config/yubikey.nix ../config/postgresql.nix |