diff --git a/lazy-lock.json b/lazy-lock.json
index 771e97b0..0270c838 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -55,5 +55,5 @@
   "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" },
   "vim-vsnip": { "branch": "master", "commit": "8eebdf6ab4a880d845893f210fd20516d2e2384f" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
-  "wildfire.vim": { "branch": "master", "commit": "dfcf48aad2e80c63272df67a1b81e37cbc443412" }
+  "wildfire.nvim": { "branch": "master", "commit": "1729faca1c6ae34520a6e531983a3737d3654ee1" }
 }
\ No newline at end of file
diff --git a/lua/tools/init.lua b/lua/tools/init.lua
index 7ec85b64..f9163106 100644
--- a/lua/tools/init.lua
+++ b/lua/tools/init.lua
@@ -185,8 +185,11 @@ register("nvim-telescope/telescope.nvim", {
 })
 
 -- Quick select for text objects
-register("gcmt/wildfire.vim", {
+register("sustech-data/wildfire.nvim", {
   keys = "<Enter>",
+  config = function()
+    require("wildfire").setup()
+  end,
 })
 
 -- Surround operation
diff --git a/lua/treesitter/config.lua b/lua/treesitter/config.lua
index 65ec9986..21da3a11 100644
--- a/lua/treesitter/config.lua
+++ b/lua/treesitter/config.lua
@@ -1,5 +1,14 @@
 require("nvim-treesitter.configs").setup({
   auto_install = false,
+  incremental_selection = {
+    enable = true,
+    keymaps = {
+      init_selection = false,
+      node_incremental = false,
+      scope_incremental = false,
+      node_decremental = false,
+    },
+  },
   highlight = {
     enable = true,
   },
@@ -19,22 +28,7 @@ require("nvim-treesitter.configs").setup({
       -- Automatically jump forward to textobj, similar to targets.vim
       lookahead = true,
 
-      keymaps = {
-        ["af"] = "@function.outer",
-        ["if"] = "@function.inner",
-        ["ac"] = "@class.outer",
-        ["ic"] = "@class.inner",
-        ["ab"] = "@block.outer",
-        ["ib"] = "@block.inner",
-        ["al"] = "@call.outer",
-        ["il"] = "@call.inner",
-        ["aP"] = "@parameter.outer",
-        ["iP"] = "@parameter.inner",
-        ["ao"] = "@conditional.outer",
-        ["io"] = "@conditional.inner",
-        ["as"] = "@statement.outer",
-        ["ar"] = "@assignment.rhs",
-      },
+      keymaps = {},
     },
   },
 })