diff --git a/home/editors/neovim/treesitter.lua b/home/editors/neovim/treesitter.lua
index c3eceec..ebe8e52 100644
--- a/home/editors/neovim/treesitter.lua
+++ b/home/editors/neovim/treesitter.lua
@@ -7,10 +7,18 @@ require'nvim-treesitter.configs'.setup {
   },
   indent = {
     enable = true,
+    -- TODO seems to be broken atm
+    disable = { "javascript", "javascriptreact", "typescript", "typescriptreact" },
   },
   refactor = {
     highlight_definitions = { enable = true },
     highlight_current_scope = { enable = true },
+    smart_rename = {
+      enable = true,
+      keymaps = {
+        smart_rename = "grr",
+      },
+    },
     navigation = {
       enable = true,
       keymaps = {
@@ -43,5 +51,33 @@ require'nvim-treesitter.configs'.setup {
         ["ia"] = "@parameter.inner",
       },
     },
+    swap = {
+      enable = true,
+      swap_next = {
+        ["<C-l>"] = "@parameter.inner",
+      },
+      swap_previous = {
+        ["<C-h>"] = "@parameter.inner",
+      },
+    },
+    move = {
+      enable = true,
+      goto_next_start = {
+        ["]m"] = "@function.outer",
+        ["]]"] = "@class.outer",
+      },
+      goto_next_end = {
+        ["]M"] = "@function.outer",
+        ["]["] = "@class.outer",
+      },
+      goto_previous_start = {
+        ["[m"] = "@function.outer",
+        ["[["] = "@class.outer",
+      },
+      goto_previous_end = {
+        ["[M"] = "@function.outer",
+        ["[]"] = "@class.outer",
+      },
+    },
   },
 }