From c0112661ad4480ca4135235813d61e0d6b799b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Wed, 6 Sep 2023 08:58:23 +0200
Subject: [PATCH] feat: update vimPlugins

---
 flake.lock              | 36 +++++++++++++++++++++++++++---------
 flake.nix               |  9 ++++++---
 overlays/vimPlugins.nix | 16 ++++++++++------
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6a8f108..e8e5f02 100644
--- a/flake.lock
+++ b/flake.lock
@@ -799,19 +799,20 @@
         "type": "github"
       }
     },
-    "nvim-treesitter-textsubjects": {
+    "nvim-treesitter": {
       "flake": false,
       "locked": {
-        "lastModified": 1691029837,
-        "narHash": "sha256-O57pMYtDR713ItAeUfdkcl2IfBLQcLEa2sb+AXhaqDs=",
-        "owner": "RRethy",
-        "repo": "nvim-treesitter-textsubjects",
-        "rev": "df75fcec548014f158cda6498ac38c4622c221e1",
+        "lastModified": 1691831669,
+        "narHash": "sha256-1Iuvq0hVQ7LyBYOkJ5d07NkwbGcR1K61ZZmAAA7ABGs=",
+        "owner": "nvim-treesitter",
+        "repo": "nvim-treesitter",
+        "rev": "63260da18bf273c76b8e2ea0db84eb901cab49ce",
         "type": "github"
       },
       "original": {
-        "owner": "RRethy",
-        "repo": "nvim-treesitter-textsubjects",
+        "owner": "nvim-treesitter",
+        "ref": "v0.9.1",
+        "repo": "nvim-treesitter",
         "type": "github"
       }
     },
@@ -871,12 +872,13 @@
         "nil": "nil",
         "nix-super": "nix-super",
         "nixpkgs": "nixpkgs_6",
-        "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
+        "nvim-treesitter": "nvim-treesitter",
         "pre-commit-hooks": "pre-commit-hooks",
         "rofi-wayland": "rofi-wayland",
         "smartcolumn-nvim": "smartcolumn-nvim",
         "stable": "stable",
         "telekasten-nvim": "telekasten-nvim",
+        "telescope-nvim": "telescope-nvim",
         "timers": "timers"
       }
     },
@@ -1028,6 +1030,22 @@
         "type": "github"
       }
     },
+    "telescope-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693850759,
+        "narHash": "sha256-309GezR93SVOD7/B8dDJIEidYziepc1s46CIRkhND1k=",
+        "owner": "nvim-telescope",
+        "repo": "telescope.nvim",
+        "rev": "20a37e43bb43c74c6091f9fea6551af0964ad45a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-telescope",
+        "repo": "telescope.nvim",
+        "type": "github"
+      }
+    },
     "timers": {
       "inputs": {
         "naersk": "naersk",
diff --git a/flake.nix b/flake.nix
index 8cdd81d..5060b8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,15 +35,18 @@
     # Neovim
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
 
-    nvim-treesitter-textsubjects.flake = false;
-    nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
-
     smartcolumn-nvim.flake = false;
     smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
 
     telekasten-nvim.flake = false;
     telekasten-nvim.url = "github:renerocksai/telekasten.nvim";
 
+    telescope-nvim.flake = false;
+    telescope-nvim.url = "github:nvim-telescope/telescope.nvim";
+
+    nvim-treesitter.flake = false;
+    nvim-treesitter.url = "github:nvim-treesitter/nvim-treesitter/v0.9.1"; # NOTE: to fix weird latest issues
+
     hmts-nvim.flake = false;
     hmts-nvim.url = "github:calops/hmts.nvim";
 
diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix
index 75fa6b3..7cafdf5 100644
--- a/overlays/vimPlugins.nix
+++ b/overlays/vimPlugins.nix
@@ -4,12 +4,6 @@ _: prev:
 with lib.my;
 {
   vimPlugins = prev.vimPlugins // {
-    nvim-treesitter-textsubjects = prev.vimUtils.buildVimPluginFrom2Nix {
-      pname = "nvim-treesitter-textsubjects";
-      version = mkVersionInput inputs.nvim-treesitter-textsubjects;
-      src = inputs.nvim-treesitter-textsubjects;
-    };
-
     smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
       pname = "smartcolumn-nvim";
       version = mkVersionInput inputs.smartcolumn-nvim;
@@ -33,5 +27,15 @@ with lib.my;
       version = mkVersionInput inputs.actions-preview-nvim;
       src = inputs.actions-preview-nvim;
     };
+
+    telescope-nvim = prev.vimPlugins.telescope-nvim.overrideAttrs (_: {
+      version = mkVersionInput inputs.telescope-nvim;
+      src = inputs.telescope-nvim;
+    });
+
+    nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (_: {
+      version = mkVersionInput inputs.nvim-treesitter;
+      src = inputs.nvim-treesitter;
+    });
   };
 }