Remove treesitter context

nvim/dot-config/nvim/lua/autocmds.lua

@@ -32,3 +32,15 @@ vim.api.nvim_create_autocmd({ "InsertEnter", "WinLeave" }, {
 	group = cursor_group,
 	pattern = "*",
 })
+
+vim.api.nvim_create_autocmd("FileType", {
+	pattern = require("tools.highlight"),
+	callback = function()
+		-- syntax highlighting, provided by Neovim
+		vim.treesitter.start()
+		-- folds, provided by Neovim
+		vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+		-- indentation, provided by nvim-treesitter
+		vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+	end,
+})

nvim/dot-config/nvim/lua/plugins/neotree.lua

@@ -11,7 +11,7 @@ return {
 	},
 	cmd = { "Neotree" },
 	keys = {
-		{ "<F2>", "<cmd>Neotree toggle last<cr>", desc = "Open floating Neo-tree window" },
+		{ "<F2>", "<cmd>Neotree toggle reveal<cr>", desc = "Open floating Neo-tree window" },
 	},
 	-- netrw hijack does not work when lazy loading
 	lazy = false,

nvim/dot-config/nvim/lua/plugins/treesitter.lua

@@ -4,27 +4,15 @@ return {
 		"nvim-treesitter/nvim-treesitter",
 		dependencies = {
 			"nvim-treesitter/nvim-treesitter-context",
-			"nvim-treesitter/nvim-treesitter-textobjects",
+			{ "nvim-treesitter/nvim-treesitter-textobjects", branch = "main" },
 			"windwp/nvim-ts-autotag",
 		},
+		lazy = false,
+		branch = "main",
+		build = ":TSUpdate",
 		opts = {
 			-- Add languages to be installed here that you want installed for treesitter
-			ensure_installed = {
+			ensure_installed = require("tools.highlight"),
-				"c",
-				"cpp",
-				"go",
-				"lua",
-				"python",
-				"rust",
-				"tsx",
-				"typescript",
-				"vimdoc",
-				"vim",
-				"markdown",
-				"markdown_inline",
-				"bash",
-				"sql",
-			},
 
 			-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
 			auto_install = true,
@@ -91,15 +79,5 @@ return {
 				enable = true,
 			},
 		},
-		config = function(_, opts)
-			require("nvim-treesitter.configs").setup(opts)
-			require("nvim-treesitter.install").update({ with_sync = true })
-		end,
-	},
-	{
-		"nvim-treesitter/nvim-treesitter-context",
-		opts = {
-			separator = require("symbols.window").borderchars[3],
-		},
 	},
 }

nvim/dot-config/nvim/lua/tools/highlight.lua

@@ -0,0 +1,16 @@
+return {
+	"c",
+	"cpp",
+	"go",
+	"lua",
+	"python",
+	"rust",
+	"tsx",
+	"typescript",
+	"vimdoc",
+	"vim",
+	"markdown",
+	"markdown_inline",
+	"bash",
+	"sql",
+}