Merge branch 'main' of https://github.com/Zacharias-Brohn/nvimdots

Merge

.gitignore

@@ -1 +1,2 @@
 lazy-lock.json
+.DS_Store

lua/autocmd.lua

@@ -1,13 +1,13 @@
 local autocmd = vim.api.nvim_create_autocmd
 
-autocmd("LspAttach", {
-	callback = function(args)
-		local client = vim.lsp.get_client_by_id(args.data.client_id)
-		if client then
-			vim.lsp.document_color.enable(false, args.buf, { "background" })
-		end
-	end,
-})
+-- autocmd("LspAttach", {
+-- 	callback = function(args)
+-- 		local client = vim.lsp.get_client_by_id(args.data.client_id)
+-- 		if client then
+-- 			vim.lsp.document_color.enable(false, args.buf, { "background" })
+-- 		end
+-- 	end,
+-- })
 
 autocmd("VimLeave", {
 	command = "set guicursor=a:ver25-Cursor",

lua/config/treesitter.lua

@@ -1,13 +1,16 @@
-require'nvim-treesitter.configs'.setup {
-	ensure_installed = "all",
-	ignore_install = { "ipkg" },
-	sync_install = true,
-	auto_install = true,
-	highlight = {
-		enable = true,
-		additional_vim_regex_highlighting = false,
-	},
-	indent = {
-		enable = true,
-	},
-}
+local treesitter = require'nvim-treesitter'
+
+treesitter.setup {}
+
+vim.api.nvim_create_autocmd('FileType', {
+	callback = function(args)
+		local has_parser = pcall(vim.treesitter.get_parser, args.buf)
+
+		if not has_parser then
+			return
+		end
+
+		vim.treesitter.start()
+		vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+	end,
+})

lua/plugins/init.lua

@@ -1,7 +1,4 @@
 return {
-	{
-		require "plugins.colorschemes",
-	},
 	{
 		"nvim-mini/mini.nvim",
 		version = false,
@@ -12,6 +9,8 @@ return {
 	},
 	{
 		"nvim-treesitter/nvim-treesitter",
+		lazy = false,
+		build = ":TSUpdate",
 		config = function()
 			require "config.treesitter"
 		end,