From bdcfd462af4222c08baabf7604943500d5919642 Mon Sep 17 00:00:00 2001
From: traxys <quentin@familleboyer.net>
Date: Fri, 24 Jan 2025 22:36:47 +0100
Subject: [PATCH] Drop nixpkgs-ts with staging merge

---
 flake.lock         | 23 +++--------------------
 flake.nix          |  6 +-----
 neovim/default.nix |  2 --
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 687c21c..5692d0c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -941,22 +941,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-ts": {
-      "locked": {
-        "lastModified": 1736967369,
-        "narHash": "sha256-YA2KbrsbY9R42tZAqnn6Q24k2ZNzd506MF/gEEwfj+w=",
-        "owner": "traxys",
-        "repo": "nixpkgs",
-        "rev": "f0295438e6f868544142c466fee83bb0fc9471ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "traxys",
-        "ref": "ts",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_10": {
       "locked": {
         "lastModified": 1682600000,
@@ -975,11 +959,11 @@
     },
     "nixpkgs_11": {
       "locked": {
-        "lastModified": 1736012469,
-        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+        "lastModified": 1737632463,
+        "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+        "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
         "type": "github"
       },
       "original": {
@@ -1303,7 +1287,6 @@
         "nix-ld": "nix-ld",
         "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_11",
-        "nixpkgs-ts": "nixpkgs-ts",
         "nixvim": "nixvim",
         "nur": "nur",
         "raclette": "raclette",
diff --git a/flake.nix b/flake.nix
index b7911da..ce05e16 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-ts.url = "github:traxys/nixpkgs/ts";
     nix-gaming = {
       url = "github:fufexan/nix-gaming";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -136,10 +135,7 @@
                   "mujmap"
                 ];
               in
-              (lib.genAttrs names (name: inputs'.${name}.packages.${name}))
-              // {
-                inherit (inputs'.nixpkgs-ts.legacyPackages) umu-launcher;
-              };
+              lib.genAttrs names (name: inputs'.${name}.packages.${name});
 
             formatter = config.treefmt.build.wrapper;
 
diff --git a/neovim/default.nix b/neovim/default.nix
index 5eaa807..22176dd 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -24,8 +24,6 @@
         {
           nixpkgs.overlays = [
             (final: prev: {
-              # Wait for staging tree-sitter upgrade to avoid freezes
-              inherit (inputs.nixpkgs-ts.legacyPackages.${prev.system}) tree-sitter;
             })
           ];
         }