diff --git a/flake.lock b/flake.lock
index 4fc8fda..0f00573 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,6 +85,22 @@
         "type": "github"
       }
     },
+    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1659877975,
@@ -134,6 +150,21 @@
       }
     },
     "flake-utils_4": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_5": {
       "inputs": {
         "systems": "systems_3"
       },
@@ -151,7 +182,7 @@
         "type": "github"
       }
     },
-    "flake-utils_5": {
+    "flake-utils_6": {
       "locked": {
         "lastModified": 1659877975,
         "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -566,6 +597,7 @@
         "nuScripts": "nuScripts",
         "themes": "themes",
         "tools": "tools",
+        "zig": "zig_2",
         "zls": "zls_2"
       }
     },
@@ -763,8 +795,8 @@
     },
     "zig-overlay_2": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_5",
+        "flake-compat": "flake-compat_5",
+        "flake-utils": "flake-utils_6",
         "nixpkgs": [
           "zls",
           "nixpkgs"
@@ -784,6 +816,28 @@
         "type": "github"
       }
     },
+    "zig_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703636531,
+        "narHash": "sha256-gaXmic+so/NhvsXwoiM759HxE41tdFdjuepFmgXhpQE=",
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "rev": "d6cc5ac1207d2e4ae717515737fc47a705e57d76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "type": "github"
+      }
+    },
     "zls": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -812,7 +866,7 @@
     },
     "zls_2": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
         "gitignore": "gitignore_2",
         "langref": "langref_2",
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 9dd30b3..158bf07 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,6 +57,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    zig = {
+      url                    = "github:mitchellh/zig-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     zls = {
       url                    = "github:zigtools/zls";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -79,6 +84,7 @@
     ghosttyModule,
     nuScripts,
     fenix,
+    zig,
     tools,
     themes,
     ...
@@ -90,7 +96,11 @@
     configuration = host: system: let
       pkgs = import nixpkgs { inherit system; };
 
-      upkgs = { inherit nuScripts; } // (lib.genAttrs
+      upkgs = {
+        inherit nuScripts;
+
+        zig = zig.packages.${system}.master;
+      } // (lib.genAttrs
         [ "nixSuper" "hyprland" "hyprpicker" "ghostty" "zls" ]
         (name: inputs.${name}.packages.${system}.default));
 
diff --git a/modules/packages/default.nix b/modules/packages/default.nix
index 18f7e4a..01891b5 100644
--- a/modules/packages/default.nix
+++ b/modules/packages/default.nix
@@ -1,4 +1,4 @@
-{ ulib, pkgs, ... }: with ulib; merge
+{ ulib, pkgs, upkgs, ... }: with ulib; merge
 
 (systemPackages (with pkgs; [
   asciinema
@@ -25,8 +25,8 @@
   jdk
   lld
   maven
+  upkgs.zig
   vlang
-  zig
 ]))
 
 (graphicalPackages (with pkgs; [