diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 9bbf7a63..d734a2a2 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -25,7 +25,6 @@
     #useXkbConfig = true; # use xkbOptions in tty.
   };
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nixpkgs.config.allowUnfree = true;
 
   # This value determines the NixOS release from which the default
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 4f39f34e..6bd10480 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -24,10 +24,20 @@
       specialArgs = attrs;
       modules = [
         ({ ... }: {
-          nix.registry = {
-            nixpkgs.flake = self.inputs.nixpkgs;
+          nix = {
+            # Edit nix.conf
+            settings = {
+              experimental-features = [ "nix-command" "flakes" ];
+              keep-outputs = true;
+              auto-optimise-store = true;
+              warn-dirty = false;
+            };
+
             # Minimize dowloads of indirect nixpkgs flakes
-            nixpkgs.exact = false;
+            registry = {
+              nixpkgs.flake = self.inputs.nixpkgs;
+              nixpkgs.exact = false;
+            };
           };
         })
         ./configuration.nix