about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/profiles/base.nix13
-rw-r--r--modules/user/aszlig/profiles/managed.nix5
-rw-r--r--modules/user/devhell/profiles/base.nix14
3 files changed, 12 insertions, 20 deletions
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 = {