about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-03-15 10:26:10 +0000
committerAlyssa Ross <hi@alyssa.is>2022-03-17 22:08:30 +0000
commit357c111f49dc1c7ece742cb1611a928152073b49 (patch)
tree65506e273897100c24ec6feffb7fb220662dd220
parenta8ca1f9583d6af07ce182cd2cf038fff76f848ee (diff)
downloadnixlib-357c111f49dc1c7ece742cb1611a928152073b49.tar
nixlib-357c111f49dc1c7ece742cb1611a928152073b49.tar.gz
nixlib-357c111f49dc1c7ece742cb1611a928152073b49.tar.bz2
nixlib-357c111f49dc1c7ece742cb1611a928152073b49.tar.lz
nixlib-357c111f49dc1c7ece742cb1611a928152073b49.tar.xz
nixlib-357c111f49dc1c7ece742cb1611a928152073b49.tar.zst
nixlib-357c111f49dc1c7ece742cb1611a928152073b49.zip
Update renamed options
-rw-r--r--modules/nix/default.nix4
-rw-r--r--modules/server/acme/default.nix2
-rw-r--r--sys/atuin.nix2
-rw-r--r--sys/eve.nix2
-rw-r--r--sys/x220.nix2
5 files changed, 6 insertions, 6 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 39715962f20a..9df65c72b3c9 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -10,9 +10,9 @@ in {
     "/run/current-system/nixlib"
   ];
 
-  nix.autoOptimiseStore = true;
+  nix.settings.auto-optimise-store = true;
   nix.daemonCPUSchedPolicy = "idle";
-  nix.trustedUsers = [ "@wheel" ];
+  nix.settings.trusted-users = [ "@wheel" ];
 
   system.extraSystemBuilderCmds = ''
     ln -s ${lib.cleanSource ../..} $out/nixlib
diff --git a/modules/server/acme/default.nix b/modules/server/acme/default.nix
index f672a7f9e191..38f92c865ea2 100644
--- a/modules/server/acme/default.nix
+++ b/modules/server/acme/default.nix
@@ -4,5 +4,5 @@
   security.acme.acceptTerms = true;
 
   # TODO: email to root?
-  security.acme.email = "hi@alyssa.is";
+  security.acme.defaults.email = "hi@alyssa.is";
 }
diff --git a/sys/atuin.nix b/sys/atuin.nix
index 582478f6592e..0512f6576a00 100644
--- a/sys/atuin.nix
+++ b/sys/atuin.nix
@@ -151,7 +151,7 @@ in
     { device = "/dev/disk/by-uuid/49f18b74-5f6e-4e61-b569-f7cc9dc5c600"; }
   ];
 
-  nix.maxJobs = 2;
+  nix.settings.max-jobs = 2;
 
   boot.loader.grub.configurationLimit = 2;
 
diff --git a/sys/eve.nix b/sys/eve.nix
index 5c5647754a3b..10a116df1006 100644
--- a/sys/eve.nix
+++ b/sys/eve.nix
@@ -33,7 +33,7 @@
   networking.hostName = "eve";
   networking.hostId = "c00b7876";
 
-  nix.maxJobs = 4;
+  nix.settings.max-jobs = 4;
 
   console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u32n.psf.gz";
   console.earlySetup = true;
diff --git a/sys/x220.nix b/sys/x220.nix
index 5ff041556b4c..a8b20eb2c055 100644
--- a/sys/x220.nix
+++ b/sys/x220.nix
@@ -61,7 +61,7 @@
     }
   ];
 
-  nix.maxJobs = 2;
+  nix.settings.max-jobs = 2;
   powerManagement.cpuFreqGovernor = "powersave";
 
   networking.hostName = "x220";