5 files changed, 4 insertions, 12 deletions
diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix
index e9d76180..6e9a5eb7 100644
--- a/machines/devhell/eir.nix
+++ b/machines/devhell/eir.nix
@@ -83,9 +83,6 @@
 
   nix = {
     maxJobs = lib.mkDefault 4;
-    extraOptions = ''
-      auto-optimise-store = true
-    '';
   };
 
   i18n = {
diff --git a/machines/devhell/gunnr.nix b/machines/devhell/gunnr.nix
index 058c2102..3ca2a195 100644
--- a/machines/devhell/gunnr.nix
+++ b/machines/devhell/gunnr.nix
@@ -79,9 +79,6 @@
 
   nix = {
     maxJobs = lib.mkDefault 16;
-    extraOptions = ''
-      auto-optimise-store = true
-    '';
   };
 
   i18n = {
diff --git a/machines/devhell/herja.nix b/machines/devhell/herja.nix
index d62057c5..866a46ad 100644
--- a/machines/devhell/herja.nix
+++ b/machines/devhell/herja.nix
@@ -85,9 +85,6 @@
 
   nix = {
     maxJobs = lib.mkDefault 8;
-    extraOptions = ''
-      auto-optimise-store = true
-    '';
   };
 
   i18n = {
diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix
index 0c3e777d..a8139654 100644
--- a/machines/devhell/hildr.nix
+++ b/machines/devhell/hildr.nix
@@ -77,9 +77,6 @@
 
   nix = {
     maxJobs = lib.mkDefault 4;
-    extraOptions = ''
-      auto-optimise-store = true
-    '';
   };
 
   i18n = {
diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix
index 29471f82..2092482d 100644
--- a/modules/user/devhell/profiles/base.nix
+++ b/modules/user/devhell/profiles/base.nix
@@ -17,6 +17,10 @@ in {
     nix = {
       buildCores = 0;
       useSandbox = true;
+      extraOptions = ''
+        auto-optimise-store = true;
+        experimental-features = nix-command flakes
+      '';
     };
 
     time = {