diff --git a/tongfang/nixos/configuration.nix b/tongfang/nixos/configuration.nix
index 7066980..868b66a 100644
--- a/tongfang/nixos/configuration.nix
+++ b/tongfang/nixos/configuration.nix
@@ -39,6 +39,19 @@
     ];
   };
 
+  # Optimization & Garbage Collection
+
+  # Optimize Nix-Store During Rebuilds
+    # NOTE: Optimizes during builds - results in slower builds
+  nix.settings.auto-optimise-store = true;
+
+  # Purge Unused Nix-Store Entries
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 14d";
+  };
+
   # Enable Nix Flakes and experimental features
   nixpkgs.config.allowUnfree = true;
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
diff --git a/tongfang/nixos/flake.lock b/tongfang/nixos/flake.lock
index d5e603d..2fac904 100644
--- a/tongfang/nixos/flake.lock
+++ b/tongfang/nixos/flake.lock
@@ -1,5 +1,39 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 0,
@@ -28,10 +62,42 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1708161998,
+        "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "84d981bae8b5e783b3b548de505b22880559515f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "zen-browser": "zen-browser"
+        "zen-browser": "zen-browser",
+        "zig": "zig"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     },
     "zen-browser": {
@@ -51,6 +117,26 @@
         "repo": "zen-browser-flake",
         "type": "github"
       }
+    },
+    "zig": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1730722337,
+        "narHash": "sha256-tvbAprVy34KXPywdbPhIW9+0ZfrHvmtaGWSk16dg/Z8=",
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "rev": "efff314a4daabec1de625a1780e774fdaea50605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/tongfang/nixos/flake.nix b/tongfang/nixos/flake.nix
index 760bcdb..2071b5b 100644
--- a/tongfang/nixos/flake.nix
+++ b/tongfang/nixos/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
+    zig.url = "github:mitchellh/zig-overlay";
   };
 
   outputs = { self, nixpkgs, ... }@inputs: {
diff --git a/tongfang/nixos/packages.nix b/tongfang/nixos/packages.nix
index e2164ee..e9cd9a8 100644
--- a/tongfang/nixos/packages.nix
+++ b/tongfang/nixos/packages.nix
@@ -26,6 +26,7 @@ in
     '')
     dig
     caligula
+    inputs.zig.packages."${system}".default
     spotify
     texlive.combined.scheme-full 
   ];