Skip to content

Commit 40823a7

Browse files
committed
nix: Install vimPlugins.nvim-treesitter from nixpkgs-unstable
Follow-up to previous commit. Also updates the nixCats flake, which is required for collating grammars that use the new derivation naming scheme[1]. [1]: BirdeeHub/nixCats-nvim#391
1 parent 05caac9 commit 40823a7

File tree

2 files changed

+6
-87
lines changed

2 files changed

+6
-87
lines changed

flake.lock

Lines changed: 4 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
nixCats.url = "github:BirdeeHub/nixCats-nvim";
1717
neovim-overlay.url = "github:nix-community/neovim-nightly-overlay";
18-
nvim-treesitter-main.url = "github:iofq/nvim-treesitter-main";
1918

2019
rust-overlay.url = "https://flakehub.com/f/oxalica/rust-overlay/0.1";
2120

@@ -48,7 +47,6 @@
4847
nix-darwin,
4948
nixCats,
5049
neovim-overlay,
51-
nvim-treesitter-main,
5250
rust-overlay,
5351
monolisa,
5452
agenix,
@@ -138,12 +136,6 @@
138136
let
139137
system = pkgs.stdenv.hostPlatform.system;
140138

141-
dependencyOverlays = [
142-
# Overlays vimPlugins.{nvim-treesitter,nvim-treesitter-textobjects} with the revision
143-
# from their respective 'main' branch (full rewrite, incompatible with old 'master').
144-
nvim-treesitter-main.overlays.default
145-
];
146-
147139
categoryDefinitions =
148140
{ pkgs, ... }:
149141
{
@@ -169,9 +161,6 @@
169161
wrapRc = false;
170162
aliases = [ "vi" ];
171163
neovim-unwrapped = neovim-overlay.packages.${system}.neovim;
172-
# The nvim-treesitter-main overlay collates grammars itself,
173-
# making this setting ineffective (iofq/nvim-treesitter-main#19).
174-
collate_grammars = false;
175164
};
176165
categories = {
177166
general = true;
@@ -181,7 +170,8 @@
181170

182171
luaPath = ./.;
183172
nixCatsBuilder = nixCats.utils.baseBuilder luaPath {
184-
inherit nixpkgs system dependencyOverlays;
173+
nixpkgs = nixpkgs-unstable;
174+
inherit system;
185175
} categoryDefinitions packageDefinitions;
186176

187177
defaultPackageName = "nvim";

0 commit comments

Comments
 (0)