From a5b3690f9040073c57d35db5270d378327e88e0e Mon Sep 17 00:00:00 2001
From: 0xrsydn <rafayrussani@gmail.com>
Date: Fri, 24 Oct 2025 10:48:14 +0700
Subject: [PATCH] fix: zig nightly -> zig 0_14

---
 devshells/README.md       |  7 ------
 devshells/zig-nightly.nix | 13 ----------
 flake.lock                | 25 +-----------------
 flake.nix                 | 53 +--------------------------------------
 4 files changed, 2 insertions(+), 96 deletions(-)
 delete mode 100644 devshells/zig-nightly.nix

diff --git a/devshells/README.md b/devshells/README.md
index 5e5872b..e732e31 100644
--- a/devshells/README.md
+++ b/devshells/README.md
@@ -107,13 +107,6 @@ nix develop .#rust
 - rustfmt
 - clippy
 
-### `zig-nightly` (optional)
-Zig nightly development (only available if zig overlay is working).
-
-```bash
-nix develop .#zig-nightly
-```
-
 ## Usage from Any Directory
 
 ### Option 1: Direct Path Reference
diff --git a/devshells/zig-nightly.nix b/devshells/zig-nightly.nix
deleted file mode 100644
index 2d7b5be..0000000
--- a/devshells/zig-nightly.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, lib, zigPackage, ... }:
-
-lib.optionalAttrs (zigPackage != null) (pkgs.mkShell {
-  name = "zig-nightly";
-  packages = [ zigPackage pkgs.zls pkgs.pkg-config pkgs.cmake pkgs.gdb ];
-  shellHook = ''
-    mkdir -p "$PWD/.cache/zig"
-    export ZIG_GLOBAL_CACHE_DIR="$PWD/.cache/zig"
-    echo "Zig shell using ${zigPackage.pname or "zig"} ${
-      zigPackage.version or ""
-    }"
-  '';
-})
diff --git a/flake.lock b/flake.lock
index 53c026c..3a4f6f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -212,8 +212,7 @@
         "home-manager": "home-manager",
         "nix-ai-tools": "nix-ai-tools",
         "nixpkgs": "nixpkgs_2",
-        "sops-nix": "sops-nix",
-        "zig-overlay": "zig-overlay"
+        "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
@@ -331,28 +330,6 @@
         "type": "github"
       }
     },
-    "zig-overlay": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1760747435,
-        "narHash": "sha256-wNB/W3x+or4mdNxFPNOH5/WFckNpKgFRZk7OnOsLtm0=",
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "rev": "d0f239b887b1ac736c0f3dde91bf5bf2ecf3a420",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "type": "github"
-      }
-    },
     "zon2nix": {
       "inputs": {
         "nixpkgs": "nixpkgs"
diff --git a/flake.nix b/flake.nix
index 3c84956..4284dd9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,9 +17,6 @@
 
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
-
-    zig-overlay.url = "github:mitchellh/zig-overlay";
-    zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs@{ self, nixpkgs, darwin, home-manager, ghostty, nix-ai-tools
@@ -36,11 +33,6 @@
 
       overlaysList = [ ghostty.overlays.default ];
 
-      zigOverlay = if builtins.hasAttr "zig-overlay" inputs then
-        inputs."zig-overlay"
-      else
-        null;
-
       mkPkgs = system:
         import nixpkgs {
           inherit system;
@@ -109,49 +101,8 @@
           else
             pkgs.python3;
 
-          # Zig overlay setup for zig-nightly shell
-          zigPackages =
-            if zigOverlay != null && builtins.hasAttr "packages" zigOverlay then
-              zigOverlay.packages
-            else
-              { };
-
-          zigCandidate =
-            if zigOverlay != null && system == "aarch64-darwin" then
-              lib.attrByPath [ system "master" "zig" ] null zigPackages
-            else
-              null;
-
-          zigCandidateBroken = if zigCandidate != null then
-            if zigCandidate ? meta && zigCandidate.meta ? broken then
-              zigCandidate.meta.broken
-            else
-              false
-          else
-            true;
-
-          zigFallback = pkgs.zig;
-          zigFallbackBroken =
-            if zigFallback ? meta && zigFallback.meta ? broken then
-              zigFallback.meta.broken
-            else
-              false;
-
-          zigPackage =
-            if zigCandidate != null && zigCandidateBroken == false then
-              zigCandidate
-            else if zigFallbackBroken == false then
-              zigFallback
-            else
-              null;
-
-          zlsBroken = if pkgs.zls ? meta && pkgs.zls.meta ? broken then
-            pkgs.zls.meta.broken
-          else
-            false;
-
           # Common arguments passed to all devshell imports
-          shellArgs = { inherit pkgs lib python zigPackage; };
+          shellArgs = { inherit pkgs lib python; };
 
           # Import all devshells from devshells/ directory
           importShell = name: import (./devshells + "/${name}.nix") shellArgs;
@@ -163,8 +114,6 @@
           go = importShell "go";
           web-bun = importShell "web-bun";
           rust = importShell "rust";
-        } // lib.optionalAttrs (zigPackage != null && zlsBroken == false) {
-          zig-nightly = importShell "zig-nightly";
         });
 
       formatter = forEachSystem (system: (mkPkgs system).nixfmt-classic);