From 1e58d4494c87e1f27c7cb7662089458f5601f84f Mon Sep 17 00:00:00 2001
From: Jose Carvajal <josecarcar1@gmail.com>
Date: Sat, 14 Mar 2026 18:06:44 -0600
Subject: [PATCH] Remove some plugins that were conflicting or not being used

---
 lazy-lock.json                       |  1 -
 lua/kickstart/plugins/mini.lua       |  6 ++----
 lua/kickstart/plugins/treesitter.lua | 30 +++++++++++++++++++++++++---
 lua/lazy-plugins.lua                 |  2 +-
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index be299e4c..625bc1c7 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,7 +9,6 @@
   "fzf-lua": { "branch": "main", "commit": "d9508cc1d05ffcdc91a32dfd38fc1013a56b20da" },
   "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
-  "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
diff --git a/lua/kickstart/plugins/mini.lua b/lua/kickstart/plugins/mini.lua
index faaac75c..5282d033 100644
--- a/lua/kickstart/plugins/mini.lua
+++ b/lua/kickstart/plugins/mini.lua
@@ -16,7 +16,8 @@ return {
       -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
       -- - sd'   - [S]urround [D]elete [']quotes
       -- - sr)'  - [S]urround [R]eplace [)] [']
-      require('mini.surround').setup()
+      -- TODO: not sure if I need it, will disable for now
+      -- require('mini.surround').setup()
 
       -- Simple and easy statusline.
       --  You could remove this setup call if you don't like it,
@@ -36,9 +37,6 @@ return {
       require('mini.bracketed').setup()
       require('mini.operators').setup()
       require('mini.bufremove').setup()
-      require('mini.jump').setup()
-      require('mini.jump2d').setup()
-      require('mini.pairs').setup()
 
       -- ... and there is more!
       --  Check out: https://github.com/echasnovski/mini.nvim
diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua
index 4aa05fe6..655340fa 100644
--- a/lua/kickstart/plugins/treesitter.lua
+++ b/lua/kickstart/plugins/treesitter.lua
@@ -9,8 +9,26 @@ return {
     -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
     config = function(_, opts)
       require('nvim-treesitter').setup(opts)
-      local ensureInstalled =
-        { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'go', 'rust', 'elixir', 'toml', 'yaml' }
+      local ensureInstalled = {
+        'bash',
+        'c',
+        'diff',
+        'html',
+        'lua',
+        'luadoc',
+        'markdown',
+        'markdown_inline',
+        'query',
+        'vim',
+        'vimdoc',
+        'go',
+        'rust',
+        'elixir',
+        'toml',
+        'yaml',
+        'ecma',
+        'typescript',
+      }
       local alreadyInstalled = require('nvim-treesitter').get_installed 'parsers'
       local parsersToInstall = vim
         .iter(ensureInstalled)
@@ -18,7 +36,7 @@ return {
           return not vim.tbl_contains(alreadyInstalled, parser)
         end)
         :totable()
-      print(parsersToInstall)
+      -- print(parsersToInstall)
       if #parsersToInstall > 0 then
         require('nvim-treesitter').install(parsersToInstall)
       end
@@ -37,6 +55,12 @@ return {
             end
           end,
         })
+
+        -- special case for handling tsx files
+        if parser == 'typescript' then
+          -- table.insert(filetypes, 'typescriptreact')
+          vim.treesitter.language.register('typescript', { 'ts', 'typescript', 'typescriptreact' })
+        end
       end
     end,
     -- There are additional nvim-treesitter modules that you can use to interact
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index 597c465e..21594196 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -58,7 +58,7 @@ require('lazy').setup({
   require 'custom/plugins/oil',
   require 'custom/plugins/trouble',
   require 'custom/plugins/flash',
-  require 'custom/plugins/harpoon',
+  -- require 'custom/plugins/harpoon',
   require 'custom/plugins/lualine',
   require 'custom/plugins/noice',
   require 'custom/plugins/theme',