diff --git a/init.lua b/init.lua
index 1fe0134..b6b1ae3 100644
--- a/init.lua
+++ b/init.lua
@@ -335,75 +335,6 @@ vim.api.nvim_create_autocmd('TextYankPost', {
 	pattern = '*',
 })
 
--- [[ Configure Treesitter ]]
--- See `:help nvim-treesitter`
--- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
-vim.defer_fn(function()
-	require('nvim-treesitter.configs').setup {
-		-- Add languages to be installed here that you want installed for treesitter
-		ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
-
-		-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
-		auto_install = false,
-
-		highlight = { enable = true },
-		indent = { enable = true },
-		incremental_selection = {
-			enable = true,
-			keymaps = {
-				init_selection = '<c-space>',
-				node_incremental = '<c-space>',
-				scope_incremental = '<c-s>',
-				node_decremental = '<M-space>',
-			},
-		},
-		textobjects = {
-			select = {
-				enable = true,
-				lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
-				keymaps = {
-					-- You can use the capture groups defined in textobjects.scm
-					['aa'] = '@parameter.outer',
-					['ia'] = '@parameter.inner',
-					['af'] = '@function.outer',
-					['if'] = '@function.inner',
-					['ac'] = '@class.outer',
-					['ic'] = '@class.inner',
-				},
-			},
-			move = {
-				enable = true,
-				set_jumps = true, -- whether to set jumps in the jumplist
-				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',
-				},
-			},
-			swap = {
-				enable = true,
-				swap_next = {
-					['<leader>a'] = '@parameter.inner',
-				},
-				swap_previous = {
-					['<leader>A'] = '@parameter.inner',
-				},
-			},
-		},
-	}
-end, 0)
-
 -- Theme
 require('kanagawa').setup { transparent = true }
 vim.cmd [[colorscheme kanagawa]]
diff --git a/lua/plugins/custom/treesitter.lua b/lua/plugins/custom/treesitter.lua
new file mode 100644
index 0000000..6cf648d
--- /dev/null
+++ b/lua/plugins/custom/treesitter.lua
@@ -0,0 +1,77 @@
+return {
+	{
+		'nvim-treesitter/nvim-treesitter',
+		event = { 'BufReadPost', 'BufNewFile' },
+		build = ':TSUpdate',
+		dependencies = {
+			'nvim-treesitter/nvim-treesitter-textobjects',
+		},
+		config = function()
+			-- See `:help nvim-treesitter`
+			-- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
+			vim.defer_fn(function()
+				require('nvim-treesitter.configs').setup {
+					-- Add languages to be installed here that you want installed for treesitter
+					ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
+					-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
+					auto_install = false,
+					highlight = { enable = true },
+					indent = { enable = true },
+					incremental_selection = {
+						enable = true,
+						keymaps = {
+							init_selection = '<c-space>',
+							node_incremental = '<c-space>',
+							scope_incremental = '<c-s>',
+							node_decremental = '<M-space>',
+						},
+					},
+					textobjects = {
+						select = {
+							enable = true,
+							lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+							keymaps = {
+								-- You can use the capture groups defined in textobjects.scm
+								['aa'] = '@parameter.outer',
+								['ia'] = '@parameter.inner',
+								['af'] = '@function.outer',
+								['if'] = '@function.inner',
+								['ac'] = '@class.outer',
+								['ic'] = '@class.inner',
+							},
+						},
+						move = {
+							enable = true,
+							set_jumps = true, -- whether to set jumps in the jumplist
+							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',
+							},
+						},
+						swap = {
+							enable = true,
+							swap_next = {
+								['<leader>a'] = '@parameter.inner',
+							},
+							swap_previous = {
+								['<leader>A'] = '@parameter.inner',
+							},
+						},
+					},
+				}
+			end, 0)
+		end,
+	},
+}