13 files changed, 25 insertions, 42 deletions
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 89f4434c..5651b73f 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -20,7 +20,7 @@ let
 in {
   vuizvui.user.aszlig.profiles.workstation.enable = true;
 
-  nix.maxJobs = 24;
+  nix.settings.max-jobs = 24;
 
   hardware.printers.ensureDefaultPrinter = "Bunti";
   hardware.printers.ensurePrinters = lib.singleton {
diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index 8fb96ec8..6960a0b6 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -31,7 +31,7 @@ in {
 
   networking.hostName = "brawndo";
 
-  nix.maxJobs = 4;
+  nix.settings.max-jobs = 4;
 
   nixpkgs.config.allowUnfree = true; # XXX: More granularity!
 
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index c7190507..65ed91f7 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -53,7 +53,7 @@
 
   hardware.cpu.intel.updateMicrocode = true;
 
-  nix.maxJobs = 4;
+  nix.settings.max-jobs = 4;
 
   # English within the shell, German otherwise (like in KDE).
   programs.bash.interactiveShellInit = lib.mkBefore ''
diff --git a/machines/aszlig/meshuggah.nix b/machines/aszlig/meshuggah.nix
index deb6b122..e4bd2b76 100644
--- a/machines/aszlig/meshuggah.nix
+++ b/machines/aszlig/meshuggah.nix
@@ -14,7 +14,7 @@
 
   networking.hostName = "meshuggah";
 
-  nix.maxJobs = 2;
+  nix.settings.max-jobs = 2;
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/9bddc8d3-88ee-4aac-b885-c9abca36b863";
diff --git a/machines/aszlig/slylandro.nix b/machines/aszlig/slylandro.nix
index de678cb7..4d185bda 100644
--- a/machines/aszlig/slylandro.nix
+++ b/machines/aszlig/slylandro.nix
@@ -73,5 +73,5 @@
   services.xserver.videoDrivers = [ "amdgpu" ];
   services.xserver.libinput.enable = true;
 
-  nix.maxJobs = 16;
+  nix.settings.max-jobs = 16;
 }
diff --git a/machines/profpatsch/legosi.nix b/machines/profpatsch/legosi.nix
index 72709711..75fa771a 100644
--- a/machines/profpatsch/legosi.nix
+++ b/machines/profpatsch/legosi.nix
@@ -35,11 +35,8 @@ in {
         "nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"
       ];
 
-      extraOptions = ''
-        auto-optimise-store = true
-        min-free = ${toString (3 * 1024 * 1024 * 1024)}
-      '';
-
+      settings.auto-optimise-store = true;
+      settings.min-free = 3 * 1024 * 1024 * 1024;
     };
 
     vuizvui.user.profpatsch.server.sshPort = 7001;
diff --git a/machines/profpatsch/leguin.nix b/machines/profpatsch/leguin.nix
index 7b1364ec..d55147c1 100644
--- a/machines/profpatsch/leguin.nix
+++ b/machines/profpatsch/leguin.nix
@@ -28,11 +28,8 @@ in
         "nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"
       ];
 
-      extraOptions = ''
-        auto-optimise-store = true
-        min-free = ${toString (3 * 1024 * 1024 * 1024)}
-      '';
-
+      settings.auto-optimise-store = true;
+      settings.min-free = 3 * 1024 * 1024 * 1024;
     };
 
     boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-label/root";
diff --git a/machines/profpatsch/mikiya.nix b/machines/profpatsch/mikiya.nix
index 74acc76b..915f1243 100644
--- a/machines/profpatsch/mikiya.nix
+++ b/machines/profpatsch/mikiya.nix
@@ -63,7 +63,7 @@ in {
       fsType = "ext3";
     };
 
-    nix.maxJobs = 4;
+    nix.settings.max-jobs = 4;
 
     vuizvui.user.profpatsch.server.sshPort = 22;
 
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index ca62cf85..0cc1112b 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -152,11 +152,8 @@ in {
     nix.settings.trusted-public-keys = [
       "digitallyinduced.cachix.org-1:y+wQvrnxQ+PdEsCt91rmvv39qRCYzEgGQaldK26hCKE="
     ];
-
-    nix.extraOptions = ''
-      builders-use-substitutes = true
-      auto-optimise-store = true
-    '';
+    nix.settings.builders-use-substitutes = true;
+    nix.settings.auto-optimise-store = true;
 
     ##########
     # Network
diff --git a/machines/sternenseemann/racker.nix b/machines/sternenseemann/racker.nix
index ffe62f95..bcd643cc 100644
--- a/machines/sternenseemann/racker.nix
+++ b/machines/sternenseemann/racker.nix
@@ -67,7 +67,7 @@
       enableIntel2200BGFirmware = true;
     };
 
-    nix.maxJobs = 2;
+    nix.settings.max-jobs = 2;
 
     vuizvui.profiles.tvl.enable = true;
   };
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index d5e589d1..681a044a 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -9,14 +9,11 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    nix = {
-      useSandbox = true;
-      readOnlyStore = true;
-      buildCores = 0;
-      extraOptions = ''
-        auto-optimise-store = true
-        experimental-features = nix-command flakes
-      '';
+    nix.readOnlyStore = true;
+    nix.settings = {
+      sandbox = true;
+      auto-optimise-store = true;
+      experimental-features = [ "nix-command" "flakes" ];
     };
 
     users.defaultUserShell = "/var/run/current-system/sw/bin/zsh";
diff --git a/modules/user/aszlig/profiles/managed.nix b/modules/user/aszlig/profiles/managed.nix
index dd4bcd58..afb19a2f 100644
--- a/modules/user/aszlig/profiles/managed.nix
+++ b/modules/user/aszlig/profiles/managed.nix
@@ -88,10 +88,9 @@ in {
     networking.firewall.enable = false;
     networking.networkmanager.enable = true;
 
-    nix.autoOptimiseStore = true;
-    nix.buildCores = 0;
     nix.readOnlyStore = true;
-    nix.useSandbox = true;
+    nix.settings.sandbox = true;
+    nix.settings.auto-optimise-store = true;
 
     nixpkgs.config.pulseaudio = true;
 
diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix
index 41f5e7cd..e5803fd6 100644
--- a/modules/user/devhell/profiles/base.nix
+++ b/modules/user/devhell/profiles/base.nix
@@ -14,15 +14,11 @@ in {
       cleanTmpDir = true;
     };
 
-    nix = {
-      settings = {
-        sandbox = true;
-        cores = 0;
-      };
-      extraOptions = ''
-        auto-optimise-store = true
-        experimental-features = nix-command flakes
-      '';
+    nix.settings = {
+      sandbox = true;
+      cores = 0;
+      auto-optimise-store = true;
+      experimental-features = [ "nix-command" "flakes" ];
     };
 
     time = {