diff --git a/laptop/plugin/treesitter.lua b/laptop/plugin/treesitter.lua
new file mode 100644
index 0000000..74a75d5
--- /dev/null
+++ b/laptop/plugin/treesitter.lua
@@ -0,0 +1,8 @@
+local configs = require("nvim-treesitter.configs")
+
+configs.setup({
+    ensure_installed = { "rust", "lua", "vim", "vimdoc", "latex", "ocaml", "yaml", "dockerfile", "make" },
+    sync_install = false,
+    highlight = { enable = true },
+    indent = { enable = true },
+})
diff --git a/laptop/plugins.lua b/laptop/plugins.lua
index cccfd0a..66b3e3d 100644
--- a/laptop/plugins.lua
+++ b/laptop/plugins.lua
@@ -25,6 +25,8 @@ require("lazy").setup({
     "sitiom/nvim-numbertoggle",
     -- Plugin for lean
     "julian/lean.nvim",
+    -- Treesitter
+    { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
     -- LSP related plugins
     "neovim/nvim-lspconfig",
     "nvim-lua/plenary.nvim",
@@ -41,9 +43,9 @@ require("lazy").setup({
     },
     "SirVer/ultisnips", -- For snippets
     -- Support programming terms
-    { "psliwka/vim-dirtytalk",     build = ":DirtytalkUpdate" },
+    { "psliwka/vim-dirtytalk",           build = ":DirtytalkUpdate" },
     -- vim-moonfly theme
-    { "bluz71/vim-moonfly-colors", as = "moonfly" },
+    { "bluz71/vim-moonfly-colors",       as = "moonfly" },
     -- Rust tools
     "simrat39/rust-tools.nvim",
     -- Automatically add bracket pairs
diff --git a/server/plugin/treesitter.lua b/server/plugin/treesitter.lua
new file mode 100644
index 0000000..d1d70cd
--- /dev/null
+++ b/server/plugin/treesitter.lua
@@ -0,0 +1,8 @@
+local configs = require("nvim-treesitter.configs")
+
+configs.setup({
+    ensure_installed = { "lua", "vim", "vimdoc", "yaml", "dockerfile" },
+    sync_install = false,
+    highlight = { enable = true },
+    indent = { enable = true },
+})
diff --git a/server/plugins.lua b/server/plugins.lua
index ca0672e..0074cfa 100644
--- a/server/plugins.lua
+++ b/server/plugins.lua
@@ -23,6 +23,8 @@ require("lazy").setup({
     "lambdalisue/suda.vim",
     -- Auto toggle for number mode when vim isn't focused
     "sitiom/nvim-numbertoggle",
+    -- Treesitter
+    { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
     -- LSP related plugins
     "neovim/nvim-lspconfig",
     {
diff --git a/vps/plugin/treesitter.lua b/vps/plugin/treesitter.lua
new file mode 100644
index 0000000..d1d70cd
--- /dev/null
+++ b/vps/plugin/treesitter.lua
@@ -0,0 +1,8 @@
+local configs = require("nvim-treesitter.configs")
+
+configs.setup({
+    ensure_installed = { "lua", "vim", "vimdoc", "yaml", "dockerfile" },
+    sync_install = false,
+    highlight = { enable = true },
+    indent = { enable = true },
+})
diff --git a/vps/plugins.lua b/vps/plugins.lua
index 8229338..b1339dc 100644
--- a/vps/plugins.lua
+++ b/vps/plugins.lua
@@ -23,6 +23,8 @@ require("lazy").setup({
     "lambdalisue/suda.vim",
     -- Auto toggle for number mode when vim isn't focused
     "sitiom/nvim-numbertoggle",
+    -- Treesitter
+    { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
     -- LSP related plugins
     "neovim/nvim-lspconfig",
     {