Temporary fixes nix tree-sitter while waiting for unstable release

issue: github.com/NixOS/nixpkgs/pull/173522
pistachiology · May 20, 2022 · 92d69d0 · 92d69d0
1 parent 5ecde45
commit 92d69d0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 14 deletions.
diff --git a/nixpkgs/flake.lock b/nixpkgs/flake.lock
diff --git a/nixpkgs/modules/neovim.nix b/nixpkgs/modules/neovim.nix
@@ -1,4 +1,12 @@
 { config, pkgs, libs, lib, ... }:
+let
+  tree-sitter = pkgs.tree-sitter.override {
+    extraGrammars = {
+      tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
+    };
+  };
+  grammars = tree-sitter.allGrammars;
+in
 {
   programs.neovim = {
     enable = true;
@@ -24,7 +32,7 @@
     '';
 
     plugins = with pkgs.vimPlugins; [
-      (nvim-treesitter.withPlugins (p: pkgs.tree-sitter.allGrammars))
+      (nvim-treesitter.withPlugins (p: grammars))
       markdown-preview-nvim
       lightspeed-nvim
       vim-prisma
@@ -33,10 +41,11 @@
   };
 
 
-  xdg.configFile."nvim/fnl" = {
-    source = ../config/nvim/fnl;
-    recursive = true;
-  };
+  xdg.configFile."nvim/fnl" =
+    {
+      source = ../config/nvim/fnl;
+      recursive = true;
+    };
 
   xdg.configFile."nvim/boot.lua" = {
     source = ../config/nvim/init.lua;

diff --git a/nixpkgs/modules/tree-sitter-nix.json b/nixpkgs/modules/tree-sitter-nix.json
@@ -0,0 +1,11 @@
+{
+  "url": "https://github.com/cstrahan/tree-sitter-nix",
+  "rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d",
+  "date": "2021-11-29T00:27:21-06:00",
+  "path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix",
+  "sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}