diff --git a/modules/nix.nix b/modules/nix.nix
index 65beaa3..c6910ea 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -2,11 +2,6 @@
 
 {
   nix = {
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-
     daemonCPUSchedPolicy = "idle";
     daemonIOSchedClass = "idle";
     daemonIOSchedPriority = 7;
@@ -16,12 +11,25 @@
     ];
 
     settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "repl-flake"
+      ];
       trusted-users = [ "@wheel" ];
       auto-optimise-store = true;
       allowed-users = [ "@wheel" ];
+
+      log-lines = lib.mkDefault 25;
+
+      # Avoid disk full issues
+      max-free = lib.mkDefault (3000 * 1024 * 1024);
+      min-free = lib.mkDefault (512 * 1024 * 10);
     };
   };
 
+  systemd.services.nix-daemon.serviceConfig.OOMScoreAdjust = 250;
+
   nixpkgs.overlays = with inputs; [
     self.overlays.default
     (final: prev: {