diff --git a/laptop/config/keymaps.lua b/laptop/config/keymaps.lua
index 89b5dc0..529a3be 100644
--- a/laptop/config/keymaps.lua
+++ b/laptop/config/keymaps.lua
@@ -45,4 +45,4 @@ map('n', '<leader>S', ":x<cr>", { remap = false })
 map('n', '<Esc>', ':noh<cr>', { remap = false })
 
 -- Find files using fzf by ,f
-vim.keymap.set('n', '<leader>f', ':Files<cr>', { remap = false })
+map('n', '<leader>f', ':Files<cr>', { remap = false })
diff --git a/server/config/keymaps.lua b/server/config/keymaps.lua
index ecc87bc..324a630 100644
--- a/server/config/keymaps.lua
+++ b/server/config/keymaps.lua
@@ -37,4 +37,4 @@ map('n', '<leader>S', ":x<cr>", { remap = false })
 map('n', '<Esc>', ':noh<cr>', { remap = false })
 
 -- Find files using fzf by ,f
-vim.keymap.set('n', '<leader>f', ':Files<cr>', { remap = false, silent = true })
+map('n', '<leader>f', ':Files<cr>', { remap = false, silent = true })
diff --git a/server/plugin/treesitter.lua b/server/plugin/treesitter.lua
index d1d70cd..993a91c 100644
--- a/server/plugin/treesitter.lua
+++ b/server/plugin/treesitter.lua
@@ -3,6 +3,88 @@ local configs = require("nvim-treesitter.configs")
 configs.setup({
     ensure_installed = { "lua", "vim", "vimdoc", "yaml", "dockerfile" },
     sync_install = false,
-    highlight = { enable = true },
+    disable = { "latex" },
+    highlight = {
+        enable = true,
+        disable = { "make" },
+    },
     indent = { enable = true },
+    incremental_selection = {
+        enable = true,
+        keymaps = {
+            init_selection = "<C-space>",
+            node_incremental = "<C-space>",
+            scope_incremental = false,
+            node_decremental = "<bs>",
+        },
+    },
+    textobjects = {
+        select = {
+            enable = true,
+            lookahead = true,
+            keymaps = {
+                -- You can use the capture groups defined in textobjects.scm
+                ["a="] = { query = "@assignment.outer", desc = "Select outer part of an assignment" },
+                ["i="] = { query = "@assignment.inner", desc = "Select inner part of an assignment" },
+                ["l="] = { query = "@assignment.lhs", desc = "Select left hand side of an assignment" },
+                ["r="] = { query = "@assignment.rhs", desc = "Select right hand side of an assignment" },
+
+                ["aa"] = { query = "@parameter.outer", desc = "Select outer part of a parameter/argument" },
+                ["ia"] = { query = "@parameter.inner", desc = "Select inner part of a parameter/argument" },
+
+                ["ai"] = { query = "@conditional.outer", desc = "Select outer part of a conditional" },
+                ["ii"] = { query = "@conditional.inner", desc = "Select inner part of a conditional" },
+
+                ["al"] = { query = "@loop.outer", desc = "Select outer part of a loop" },
+                ["il"] = { query = "@loop.inner", desc = "Select inner part of a loop" },
+
+                ["af"] = { query = "@call.outer", desc = "Select outer part of a function call" },
+                ["if"] = { query = "@call.inner", desc = "Select inner part of a function call" },
+
+                ["am"] = { query = "@function.outer", desc = "Select outer part of a method/function definition" },
+                ["im"] = { query = "@function.inner", desc = "Select inner part of a method/function definition" },
+
+                ["ac"] = { query = "@class.outer", desc = "Select outer part of a class" },
+                ["ic"] = { query = "@class.inner", desc = "Select inner part of a class" },
+            },
+        },
+        move = {
+            enable = true,
+            set_jumps = true, -- whether to set jumps in the jumplist
+            goto_next_start = {
+                ["]f"] = { query = "@call.outer", desc = "Next function call start" },
+                ["]m"] = { query = "@function.outer", desc = "Next method/function def start" },
+                ["]c"] = { query = "@class.outer", desc = "Next class start" },
+                ["]i"] = { query = "@conditional.outer", desc = "Next conditional start" },
+                ["]l"] = { query = "@loop.outer", desc = "Next loop start" },
+
+                -- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
+                -- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
+                ["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
+                ["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
+            },
+            goto_next_end = {
+                ["]F"] = { query = "@call.outer", desc = "Next function call end" },
+                ["]M"] = { query = "@function.outer", desc = "Next method/function def end" },
+                ["]C"] = { query = "@class.outer", desc = "Next class end" },
+                ["]I"] = { query = "@conditional.outer", desc = "Next conditional end" },
+                ["]L"] = { query = "@loop.outer", desc = "Next loop end" },
+            },
+            goto_previous_start = {
+                ["[f"] = { query = "@call.outer", desc = "Prev function call start" },
+                ["[m"] = { query = "@function.outer", desc = "Prev method/function def start" },
+                ["[c"] = { query = "@class.outer", desc = "Prev class start" },
+                ["[i"] = { query = "@conditional.outer", desc = "Prev conditional start" },
+                ["[l"] = { query = "@loop.outer", desc = "Prev loop start" },
+            },
+            goto_previous_end = {
+                ["[F"] = { query = "@call.outer", desc = "Prev function call end" },
+                ["[M"] = { query = "@function.outer", desc = "Prev method/function def end" },
+                ["[C"] = { query = "@class.outer", desc = "Prev class end" },
+                ["[I"] = { query = "@conditional.outer", desc = "Prev conditional end" },
+                ["[L"] = { query = "@loop.outer", desc = "Prev loop end" },
+            },
+        },
+    }
 })
+
diff --git a/vps/config/keymaps.lua b/vps/config/keymaps.lua
index 4f7d02e..1edc1f2 100644
--- a/vps/config/keymaps.lua
+++ b/vps/config/keymaps.lua
@@ -36,4 +36,4 @@ map('n', '<leader>S', ":x<cr>", { remap = false })
 map('n', '<Esc>', ':noh<cr>', { remap = false })
 
 -- Find files using fzf by ,f
-vim.keymap.set('n', '<leader>f', ':Files<cr>', { remap = false, silent = true })
+map('n', '<leader>f', ':Files<cr>', { remap = false, silent = true })
diff --git a/vps/plugin/treesitter.lua b/vps/plugin/treesitter.lua
index d1d70cd..993a91c 100644
--- a/vps/plugin/treesitter.lua
+++ b/vps/plugin/treesitter.lua
@@ -3,6 +3,88 @@ local configs = require("nvim-treesitter.configs")
 configs.setup({
     ensure_installed = { "lua", "vim", "vimdoc", "yaml", "dockerfile" },
     sync_install = false,
-    highlight = { enable = true },
+    disable = { "latex" },
+    highlight = {
+        enable = true,
+        disable = { "make" },
+    },
     indent = { enable = true },
+    incremental_selection = {
+        enable = true,
+        keymaps = {
+            init_selection = "<C-space>",
+            node_incremental = "<C-space>",
+            scope_incremental = false,
+            node_decremental = "<bs>",
+        },
+    },
+    textobjects = {
+        select = {
+            enable = true,
+            lookahead = true,
+            keymaps = {
+                -- You can use the capture groups defined in textobjects.scm
+                ["a="] = { query = "@assignment.outer", desc = "Select outer part of an assignment" },
+                ["i="] = { query = "@assignment.inner", desc = "Select inner part of an assignment" },
+                ["l="] = { query = "@assignment.lhs", desc = "Select left hand side of an assignment" },
+                ["r="] = { query = "@assignment.rhs", desc = "Select right hand side of an assignment" },
+
+                ["aa"] = { query = "@parameter.outer", desc = "Select outer part of a parameter/argument" },
+                ["ia"] = { query = "@parameter.inner", desc = "Select inner part of a parameter/argument" },
+
+                ["ai"] = { query = "@conditional.outer", desc = "Select outer part of a conditional" },
+                ["ii"] = { query = "@conditional.inner", desc = "Select inner part of a conditional" },
+
+                ["al"] = { query = "@loop.outer", desc = "Select outer part of a loop" },
+                ["il"] = { query = "@loop.inner", desc = "Select inner part of a loop" },
+
+                ["af"] = { query = "@call.outer", desc = "Select outer part of a function call" },
+                ["if"] = { query = "@call.inner", desc = "Select inner part of a function call" },
+
+                ["am"] = { query = "@function.outer", desc = "Select outer part of a method/function definition" },
+                ["im"] = { query = "@function.inner", desc = "Select inner part of a method/function definition" },
+
+                ["ac"] = { query = "@class.outer", desc = "Select outer part of a class" },
+                ["ic"] = { query = "@class.inner", desc = "Select inner part of a class" },
+            },
+        },
+        move = {
+            enable = true,
+            set_jumps = true, -- whether to set jumps in the jumplist
+            goto_next_start = {
+                ["]f"] = { query = "@call.outer", desc = "Next function call start" },
+                ["]m"] = { query = "@function.outer", desc = "Next method/function def start" },
+                ["]c"] = { query = "@class.outer", desc = "Next class start" },
+                ["]i"] = { query = "@conditional.outer", desc = "Next conditional start" },
+                ["]l"] = { query = "@loop.outer", desc = "Next loop start" },
+
+                -- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
+                -- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
+                ["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
+                ["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
+            },
+            goto_next_end = {
+                ["]F"] = { query = "@call.outer", desc = "Next function call end" },
+                ["]M"] = { query = "@function.outer", desc = "Next method/function def end" },
+                ["]C"] = { query = "@class.outer", desc = "Next class end" },
+                ["]I"] = { query = "@conditional.outer", desc = "Next conditional end" },
+                ["]L"] = { query = "@loop.outer", desc = "Next loop end" },
+            },
+            goto_previous_start = {
+                ["[f"] = { query = "@call.outer", desc = "Prev function call start" },
+                ["[m"] = { query = "@function.outer", desc = "Prev method/function def start" },
+                ["[c"] = { query = "@class.outer", desc = "Prev class start" },
+                ["[i"] = { query = "@conditional.outer", desc = "Prev conditional start" },
+                ["[l"] = { query = "@loop.outer", desc = "Prev loop start" },
+            },
+            goto_previous_end = {
+                ["[F"] = { query = "@call.outer", desc = "Prev function call end" },
+                ["[M"] = { query = "@function.outer", desc = "Prev method/function def end" },
+                ["[C"] = { query = "@class.outer", desc = "Prev class end" },
+                ["[I"] = { query = "@conditional.outer", desc = "Prev conditional end" },
+                ["[L"] = { query = "@loop.outer", desc = "Prev loop end" },
+            },
+        },
+    }
 })
+