From 7b3369bcff4a8b7ac0c055ce579566b406e9089e Mon Sep 17 00:00:00 2001
From: bluedrink9 <bluedrink9@users.noreply.github.com>
Date: Sat, 29 Nov 2025 18:27:15 +1300
Subject: [PATCH 1/3] build: Update nix flake

Brings the node js version up to date with the required one
---
 flake.lock |  6 +++---
 flake.nix  | 52 +---------------------------------------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4e43b25df4..33aae38122 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718870667,
-        "narHash": "sha256-jab3Kpc8O1z3qxwVsCMHL4+18n5Wy/HHKyu1fcsF7gs=",
+        "lastModified": 1764290847,
+        "narHash": "sha256-VwPgoDgnd628GdE3KyLqTyPF1WWh0VwT5UoKygoi8sg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9b10b8f00cb5494795e5f51b39210fed4d2b0748",
+        "rev": "cd5fedfc384cb98d9fd3827b55f4522f49efda42",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 514d47cdef..794c27136a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,47 +22,9 @@
             pkgs = import nixpkgs {
               inherit system;
               overlays = [
-                # Updated neovim-node-client is pending merge:
-                # https://github.com/NixOS/nixpkgs/pull/317333
                 (final: prev: {
-                  nodePackages = prev.nodePackages // {
-                    neovim = prev.buildNpmPackage rec {
-                      pname = "neovim-node-client";
-                      version = "5.1.1-dev.0";
-                      src = prev.fetchFromGitHub {
-                        owner = "neovim";
-                        repo = "node-client";
-                        rev = "d99ececf115ddc8ade98467417c1bf0120b676b5";
-                        hash = "sha256-eiKyhJNz7kH2iX55lkn7NZYTj6yaSZLMZxqiqPxDIPs=";
-                      };
-                      npmDeps = prev.fetchNpmDeps {
-                        inherit src;
-                        hash = "sha256-UoMq+7evskxtZygycxLBgeUtwrET8jYKeZwMiXdBMAw=";
-                      };
-                      postInstall = ''
-                        mkdir -p $out/bin
-                        ln -s $out/lib/node_modules/neovim/node_modules/.bin/neovim-node-host $out/bin
-                      '';
-                    };
-                  };
                   neovim = prev.neovim.override { withNodeJs = true; };
-                  # There is a recent bug that prevents cli --check invocation:
-                  # See #2613
-                  lua-language-server = prev.lua-language-server.overrideAttrs {
-                    postPatch =
-                      let
-                        patch = prev.fetchurl {
-                          url = "https://github.com/LuaLS/lua-language-server/pull/2775.patch";
-                          sha256 = "sha256-5hjuNzBHLp9kiD6O8jTL5YlvaqR8IuJPHchIZE2/p/Q=";
-                        };
-                      in
-                      ''
-                        patch -p1 < ${patch}
-                      ''
-                      + prev.lua-language-server.postPatch;
-                  };
                 })
-
               ];
             };
           }
@@ -72,12 +34,6 @@
       ] (nixpkgs.lib.importTOML ./pyproject.toml).tool.ruff.target-version;
     in
     {
-      packages = forEachSupportedSystem (
-        { pkgs }:
-        {
-          lua-language-server = pkgs.lua-language-server;
-        }
-      );
       devShells = forEachSupportedSystem (
         { pkgs }:
         {
@@ -90,14 +46,8 @@
               [
                 pkgs.corepack
                 pkgs.vsce
-                pkgs.nodejs
+                pkgs.nodejs_20
 
-                # https://github.com/NixOS/nixpkgs/pull/251418
-                (pkgs.pre-commit.overrideAttrs (previousAttrs: {
-                  makeWrapperArgs = ''
-                    --set PYTHONPATH $PYTHONPATH
-                  '';
-                }))
                 python
                 pkgs.lua-language-server # language server used by pre-commit hooks
 

From 60a96a8cef3e6f9fbebaf76bd7f3cba84a378266 Mon Sep 17 00:00:00 2001
From: bluedrink9 <bluedrink9@users.noreply.github.com>
Date: Sat, 29 Nov 2025 18:58:17 +1300
Subject: [PATCH 2/3] fix: missing lua lsp alias

---
 flake.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/flake.nix b/flake.nix
index 794c27136a..20c4280463 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,6 +34,12 @@
       ] (nixpkgs.lib.importTOML ./pyproject.toml).tool.ruff.target-version;
     in
     {
+      packages = forEachSupportedSystem (
+        { pkgs }:
+        {
+          lua-language-server = pkgs.lua-language-server;
+        }
+      );
       devShells = forEachSupportedSystem (
         { pkgs }:
         {

From 5b0ab5895fff74eb6e92baad0ee80289de6f2565 Mon Sep 17 00:00:00 2001
From: bluedrink9 <bluedrink9@users.noreply.github.com>
Date: Sat, 29 Nov 2025 19:56:31 +1300
Subject: [PATCH 3/3] restore pre-commit

---
 flake.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake.nix b/flake.nix
index 20c4280463..8421847dae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,6 +53,7 @@
                 pkgs.corepack
                 pkgs.vsce
                 pkgs.nodejs_20
+                pkgs.pre-commit
 
                 python
                 pkgs.lua-language-server # language server used by pre-commit hooks