From 3041c741c927e2aa4bd5441f468fbb1bd420f0eb Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 01:46:55 +0300
Subject: [PATCH 1/4] vscode-extensions.gruntfuggly.todo-tree: move to a
 separate file

---
 .../editors/vscode/extensions/default.nix        | 12 +-----------
 .../extensions/gruntfuggly.todo-tree/default.nix | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index d6347d246831..3db0fbdbe1c9 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2112,17 +2112,7 @@ let
         };
       };
 
-      gruntfuggly.todo-tree = buildVscodeMarketplaceExtension {
-        mktplcRef = {
-          name = "todo-tree";
-          publisher = "Gruntfuggly";
-          version = "0.0.226";
-          hash = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs=";
-        };
-        meta = {
-          license = lib.licenses.mit;
-        };
-      };
+      gruntfuggly.todo-tree = callPackage ./gruntfuggly.todo-tree { };
 
       hars.cppsnippets = buildVscodeMarketplaceExtension {
         mktplcRef = {
diff --git a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
new file mode 100644
index 000000000000..6a2f5e60e722
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
@@ -0,0 +1,16 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "todo-tree";
+    publisher = "Gruntfuggly";
+    version = "0.0.226";
+    hash = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs=";
+  };
+  meta = {
+    license = lib.licenses.mit;
+  };
+}

From e42efda306ebc7ae691c413a6d2c395b15484819 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Mon, 8 Jun 2026 21:23:01 +0300
Subject: [PATCH 2/4] vscode-extensions.gruntfuggly.todo-tree: adopt

---
 .../vscode/extensions/gruntfuggly.todo-tree/default.nix        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
index 6a2f5e60e722..de4af97c8dd5 100644
--- a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
@@ -12,5 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   };
   meta = {
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      sandarukasa
+    ];
   };
 }

From 4cd58283471a7604545ea53be92af40e267fe9a6 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Mon, 8 Jun 2026 21:23:01 +0300
Subject: [PATCH 3/4] vscode-extensions.gruntfuggly.todo-tree: modernize

---
 .../extensions/gruntfuggly.todo-tree/default.nix      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
index de4af97c8dd5..a44e0a948242 100644
--- a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   vscode-utils,
+  vscode-extension-update-script,
 }:
 
 vscode-utils.buildVscodeMarketplaceExtension {
@@ -10,7 +11,17 @@ vscode-utils.buildVscodeMarketplaceExtension {
     version = "0.0.226";
     hash = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs=";
   };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  passthru.updateScript = vscode-extension-update-script { };
+
   meta = {
+    changelog = "https://marketplace.visualstudio.com/items/Gruntfuggly.todo-tree/changelog";
+    description = "Show TODO, FIXME, etc. comment tags in a tree view";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.todo-tree";
+    homepage = "https://github.com/Gruntfuggly/todo-tree";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       sandarukasa

From 4f1d484e4ee91eb5dd5043fafd8d60b4dbec892b Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Mon, 8 Jun 2026 21:23:01 +0300
Subject: [PATCH 4/4] vscode-extensions.gruntfuggly.todo-tree: bundle ripgrep

---
 .../gruntfuggly.todo-tree/default.nix           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
index a44e0a948242..5a169aee2a20 100644
--- a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix
@@ -1,5 +1,8 @@
 {
+  jq,
   lib,
+  moreutils,
+  ripgrep,
   vscode-utils,
   vscode-extension-update-script,
 }:
@@ -15,6 +18,20 @@ vscode-utils.buildVscodeMarketplaceExtension {
   __structuredAttrs = true;
   strictDeps = true;
 
+  nativeBuildInputs = [
+    jq
+    moreutils
+  ];
+
+  buildInputs = [ ripgrep ];
+
+  postInstall = ''
+    cd "$out/$installPrefix"
+    jq '(.contributes.configuration[] | select(.title == "%todo-tree.configuration.regex%") | .properties."todo-tree.ripgrep.ripgrep".default) = $s' \
+      --arg s "${lib.getExe ripgrep}" \
+      package.json | sponge package.json
+  '';
+
   passthru.updateScript = vscode-extension-update-script { };
 
   meta = {