wip: Still not ready for csharp tree-sitter

nix/base-system/flake.lock

@@ -867,11 +867,11 @@
     },
     "nixpkgs-darwin": {
       "locked": {
-        "lastModified": 1717100421,
-        "narHash": "sha256-T+0Q1QHBDCoa4yBJrY7cG3vDEhqm4PwOLmNI6mzEwVc=",
+        "lastModified": 1735564410,
+        "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "75000c2cf4422c8a1776284314921ac1289c02c9",
+        "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8",
         "type": "github"
       },
       "original": {
@@ -915,16 +915,16 @@
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1717179513,
-        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
+        "lastModified": 1738579205,
+        "narHash": "sha256-o6BeeanSUALvz8oL2CHOikVjCf7j+HqlA0WGvKOUX3Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
+        "rev": "be5cf18b3d26ba2db938a72ade93ac8a9a7462ff",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "24.05",
+        "ref": "release-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1423,11 +1423,11 @@
         "rust-overlay": "rust-overlay_7"
       },
       "locked": {
-        "lastModified": 1736294704,
-        "narHash": "sha256-YgMv21vs7nYgyclya3XK024NpVi/l1EkgoBZGtFcXvg=",
+        "lastModified": 1738116794,
+        "narHash": "sha256-TXTZx/cpk0Jv15t2QdXRliEME9B6bVyrA0SyHYBPKl8=",
         "owner": "zaphar",
         "repo": "sheetsui",
-        "rev": "d50c12a5bab588e0c08c0a046143b98701bb3ca9",
+        "rev": "0a6807493c3e8fd9f4261135f0226d801a472d53",
         "type": "github"
       },
       "original": {

nix/base-system/flake.nix

@@ -1,7 +1,7 @@
 {
   inputs = {
     # Default to sane nixpkgs versions
-    nixpkgs.url = "github:nixos/nixpkgs/24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/release-24.11";
     unstable.url = "nixpkgs";
     nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
     #lean4-flake = { 
@@ -108,6 +108,13 @@
         roslyn-nvim = custom-flakes.packages."${system}".roslyn-nvim;
         ionide-nvim = custom-flakes.packages."${system}".ionide-nvim;
         nvim = neovim-flake.packages."${system}".neovim;
+        # TODO(zaphar): Until nixpkgs update to a newer version of tree-sitter the queries will be wrong
+        # for csharp
+        #tree-sitter-csharp = pkgs.callPackage ./nvim-treesitter-csharp.nix {
+        #  inherit (pkgs.neovimUtils) grammarToPlugin;
+		    #  inherit (pkgs.tree-sitter) buildGrammar;
+			  #  inherit (pkgs) fetchFromGitHub;
+        #};
         # TODO(jwall): When this actually builds we should use it.
 		#nvim-treesitter-powershell = pkgs.callPackage ./nvim-powershell.nix {
 		#    inherit (pkgs.tree-sitter) buildGrammar;
@@ -194,7 +201,7 @@ EOF";
 				nvim-treesitter-parsers.nix
 				nvim-treesitter-parsers.zig
 				nvim-treesitter-parsers.hoon
-                omnisharp-extended-lsp-nvim
+                #omnisharp-extended-lsp-nvim
                 #neotest-dotnet
                 nix-develop-nvim
                 trouble-nvim
@@ -208,7 +215,14 @@ EOF";
                 vim-dadbod-completion
                 vim-dasht
                 direnv-vim
-              ]) ++ [ possession-nvim harpoon-nvim d2-vim hunk-nvim neogit-nvim ];
+              ]) ++ [
+                possession-nvim
+                harpoon-nvim
+                d2-vim
+                hunk-nvim
+                neogit-nvim
+                # tree-sitter-csharp.neovim-plugin # Until nixpkgs updates their nvim-treesitter config the csharp queries will be broken
+              ];
             };
           };
         };

nix/base-system/nvim-treesitter-csharp.nix

@@ -1,11 +1,16 @@
-{ buildGrammar, fetchFromGitHub, pkgs, }:
-buildGrammar {
-    language = "c-sharp";
-    version = "0.20.0-master";
+{ buildGrammar, fetchFromGitHub, grammarToPlugin, }:
+let grammar = buildGrammar {
+    language = "c_sharp";
+    version = "0.23.1-master";
     src = fetchFromGitHub {
-        owner = "tree-sitter";
-        repo = "tree-sitter-c-sharp";
-        rev = "1648e21b4f087963abf0101ee5221bb413107b07";
-        hash = "sha256-WvkHtw8t14UNqiJvmS9dbGYQSVVzHS9mcWzxq+KLMnU=";
-    };
+		  owner = "tree-sitter";
+		  repo = "tree-sitter-c-sharp";
+		  rev = "b27b091bfdc5f16d0ef76421ea5609c82a57dff0";
+		  hash = "sha256-kSbMv6fKELB5CTSevD1umUgKfb3rsucEnAVYHFiAHss=";
+		};
+};
+in
+{
+	inherit grammar;
+  neovim-plugin = grammarToPlugin grammar;
 }