diff --git a/Makefile b/Makefile
index 6548329..a7a5a70 100644
--- a/Makefile
+++ b/Makefile
@@ -11,15 +11,15 @@ debug:
 	nixos-rebuild switch --flake '.#gpd' --use-remote-sudo --show-trace --verbose
 
 update:
-	nix flake update --extra-experimental-features nix-command
+	nix flake update
 
 history:
-	nix profile history --profile /nix/var/nix/profiles/system --extra-experimental-features nix-command
+	nix profile history --profile /nix/var/nix/profiles/system
 
 gc:
 	# remove all generations older than 7 days
-	sudo nix profile wipe-history --profile /nix/var/nix/profiles/system  --older-than 3d --extra-experimental-features nix-command
+	sudo nix profile wipe-history --profile /nix/var/nix/profiles/system  --older-than 3d
 
 	# garbage collect all unused nix store entries
-	sudo nix store gc --debug --extra-experimental-features nix-command
+	sudo nix store gc --debug
 	nix-collect-garbage -d
diff --git a/global/system-configuration.nix b/global/system-configuration.nix
index 888c6a9..2ae9fd1 100644
--- a/global/system-configuration.nix
+++ b/global/system-configuration.nix
@@ -23,4 +23,14 @@
             LC_TIME = "zh_CN.UTF-8";
         };
     };
+
+    nix.settings = {
+        auto-optimise-store = true;
+        experimental-features = [
+            "nix-command"
+            "flakes"
+        ];
+    };
+    nix.gc.automatic = true;
+
 }
\ No newline at end of file