From 97a4773d51d35e52682cb724d9f0db8561c3f9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Mon, 18 Dec 2023 22:57:09 +0200
Subject: [PATCH] zig: get from upstream

---
 flake.lock              | 29 +----------------------------
 flake.nix               | 17 -----------------
 shared/home/default.nix |  2 +-
 3 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5824b11..a550244 100644
--- a/flake.lock
+++ b/flake.lock
@@ -259,8 +259,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
-        "pre-commit-hooks": "pre-commit-hooks",
-        "zigpkgs": "zigpkgs"
+        "pre-commit-hooks": "pre-commit-hooks"
       }
     },
     "systems": {
@@ -277,32 +276,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "zigpkgs": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1702850407,
-        "narHash": "sha256-dG9eKPJXgZNcXkNJwBdx/7byx08Z3ppXU1E54EY1/t0=",
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "rev": "f5d3c30b3f36ec5d3d5dd81fad850f5523767e5d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 599f6e5..2760e12 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,15 +8,6 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nur.url = "github:nix-community/NUR";
 
-    zigpkgs = {
-      url = "github:mitchellh/zig-overlay";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        flake-compat.follows = "flake-compat";
-      };
-    };
-
     home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -80,7 +71,6 @@
     nixos-hardware,
     nix-index-database,
     pre-commit-hooks,
-    zigpkgs,
     nur,
     nixgl,
     ...
@@ -106,7 +96,6 @@
     # nixpkgs-unstable. See git log around the switch from 23.05 to 23.11.
     mkOverlays = _: [
       nur.overlay
-      zigpkgs.overlays.default
     ];
   in
     {
@@ -306,12 +295,6 @@
         overlays = [
           nur.overlay
           nixgl.overlay
-          (_final: prev: {
-            zigpkgs = import zigpkgs {
-              inherit (prev) pkgs;
-              inherit system;
-            };
-          })
         ];
       };
     in {
diff --git a/shared/home/default.nix b/shared/home/default.nix
index cf24a3a..d0bceac 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -18,7 +18,7 @@
     lib.mkMerge [
       (lib.mkIf fullDesktop [
         go
-        zigpkgs."0.11.0"
+        zig
       ])
       (lib.mkIf hmOnly [
         pkgs.nixgl.nixGLIntel