diff --git a/flake.lock b/flake.lock index afcaaaa..7e0f879 100644 --- a/flake.lock +++ b/flake.lock @@ -33,28 +33,10 @@ "type": "github" } }, - "nvim-treesitter-textobjects": { - "flake": false, - "locked": { - "lastModified": 1756368113, - "narHash": "sha256-+KmOpRi4JAqm6UqYdtk80jwFrJhLCs0lZM/Liofq0R4=", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-textobjects", - "rev": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931", - "type": "github" - }, - "original": { - "owner": "nvim-treesitter", - "ref": "main", - "repo": "nvim-treesitter-textobjects", - "type": "github" - } - }, "root": { "inputs": { "nixpkgs": "nixpkgs", - "nvim-treesitter": "nvim-treesitter", - "nvim-treesitter-textobjects": "nvim-treesitter-textobjects" + "nvim-treesitter": "nvim-treesitter" } } }, diff --git a/flake.nix b/flake.nix index d342000..26e490e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,10 +7,6 @@ url = "github:nvim-treesitter/nvim-treesitter/main"; flake = false; }; - nvim-treesitter-textobjects = { - url = "github:nvim-treesitter/nvim-treesitter-textobjects/main"; - flake = false; - }; }; outputs = @@ -59,8 +55,7 @@ }; in rec { - nvim-treesitter-textobjects = pkgs'.vimPlugins.nvim-treesitter-textobjects; - nvim-treesitter = pkgs'.vimPlugins.nvim-treesitter; + nvim-treesitter = pkgs'.vimPlugins.nvim-treesitter.withAllGrammars; default = nvim-treesitter; } ); diff --git a/overlay.nix b/overlay.nix index 9900bd0..00cf4d5 100644 --- a/overlay.nix +++ b/overlay.nix @@ -55,7 +55,7 @@ in { vimPlugins = prev.vimPlugins.extend ( final': prev': { - nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (old: rec { + nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (old: rec { src = inputs.nvim-treesitter; name = "${old.pname}-${src.rev}"; postPatch = ""; @@ -64,7 +64,7 @@ in mkdir -p $out/queries cp -a $src/runtime/queries/* $out/queries "; - passthru = (prev'.nvim-treesitter.passthru or { }) // { + passthru = (prev.nvim-treesitter.passthru or { }) // { inherit builtGrammars allGrammars @@ -77,10 +77,6 @@ in }; nvimSkipModules = [ "nvim-treesitter._meta.parsers" ]; }); - nvim-treesitter-textobjects = prev'.nvim-treesitter-textobjects.overrideAttrs (old: { - version = inputs.nvim-treesitter-textobjects.rev; - src = inputs.nvim-treesitter-textobjects; - }); } );