From b2717b169956e7d2f2c55ed63ee41b8f0c196956 Mon Sep 17 00:00:00 2001 From: iofq Date: Fri, 3 Oct 2025 21:09:44 -0500 Subject: [PATCH 1/2] add nvim-treesitter-textobjects package --- flake.lock | 20 +++++++++++++++++++- flake.nix | 7 ++++++- overlay.nix | 4 ++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 7e0f879..afcaaaa 100644 --- a/flake.lock +++ b/flake.lock @@ -33,10 +33,28 @@ "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": "nvim-treesitter", + "nvim-treesitter-textobjects": "nvim-treesitter-textobjects" } } }, diff --git a/flake.nix b/flake.nix index 26e490e..d342000 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ url = "github:nvim-treesitter/nvim-treesitter/main"; flake = false; }; + nvim-treesitter-textobjects = { + url = "github:nvim-treesitter/nvim-treesitter-textobjects/main"; + flake = false; + }; }; outputs = @@ -55,7 +59,8 @@ }; in rec { - nvim-treesitter = pkgs'.vimPlugins.nvim-treesitter.withAllGrammars; + nvim-treesitter-textobjects = pkgs'.vimPlugins.nvim-treesitter-textobjects; + nvim-treesitter = pkgs'.vimPlugins.nvim-treesitter; default = nvim-treesitter; } ); diff --git a/overlay.nix b/overlay.nix index 00cf4d5..7b4d530 100644 --- a/overlay.nix +++ b/overlay.nix @@ -77,6 +77,10 @@ in }; nvimSkipModules = [ "nvim-treesitter._meta.parsers" ]; }); + nvim-treesitter-textobjects = prev.vimPlugins.nvim-treesitter-textobjects.overrideAttrs (old: { + version = inputs.nvim-treesitter-textobjects.rev; + src = inputs.nvim-treesitter-textobjects; + }); } ); From c97b865ed738c53ca9df8f09cfba1bd017fb65a8 Mon Sep 17 00:00:00 2001 From: iofq Date: Sat, 4 Oct 2025 00:50:08 -0500 Subject: [PATCH 2/2] fix overlay --- overlay.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/overlay.nix b/overlay.nix index 7b4d530..9900bd0 100644 --- a/overlay.nix +++ b/overlay.nix @@ -55,7 +55,7 @@ in { vimPlugins = prev.vimPlugins.extend ( final': prev': { - nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (old: rec { + nvim-treesitter = prev'.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,7 +77,7 @@ in }; nvimSkipModules = [ "nvim-treesitter._meta.parsers" ]; }); - nvim-treesitter-textobjects = prev.vimPlugins.nvim-treesitter-textobjects.overrideAttrs (old: { + nvim-treesitter-textobjects = prev'.nvim-treesitter-textobjects.overrideAttrs (old: { version = inputs.nvim-treesitter-textobjects.rev; src = inputs.nvim-treesitter-textobjects; });