added java/kotlin

- added dockerfile treesitter

lua/plugins/config.lua

@@ -156,7 +156,7 @@ function M.lualine()
 						return tab_mode()
 					end,
 					max_length = function()
-						return columns(1)
+						return columns(5)
 					end,
 				},
 			},
@@ -266,6 +266,48 @@ function M.nvim_treesitter()
 	end
 end
 
+function M.nvim_treesitter_new()
+	local ts = require("nvim-treesitter")
+	local install_langs = {
+		"angular",
+		"bash",
+		"css",
+		"glimmer",
+		"go",
+		"html",
+		"javascript",
+		"json",
+		"lua",
+		"markdown",
+		"python",
+		"query",
+		"rust",
+		"svelte",
+		"templ",
+		"tsx",
+		"typescript",
+		"vim",
+		"yaml",
+		"toml",
+		"php",
+		"dockerfile",
+		"java",
+		"kotlin",
+	}
+	local run_langs = vim.tbl_extend("force", install_langs, {
+		"htmlangular",
+		"sh",
+	})
+	ts.setup()
+	ts.install(install_langs)
+	vim.api.nvim_create_autocmd("FileType", {
+		pattern = run_langs,
+		callback = function()
+			vim.treesitter.start()
+		end,
+	})
+end
+
 function M.null_ls()
 	local null_ls = require("null-ls")
 	local builtins = require("plugins.null_ls")
@@ -397,7 +439,7 @@ end
 function M.luasnip()
 	local luasnip = require("luasnip")
 	--luasnip.filetype_extend("htmldjango", { "html" })
-	luasnip.filetype_extend("templ", { "html" })
+	luasnip.filetype_extend("templ", { "html", "go" })
 	luasnip.filetype_extend("handlebars", { "html" })
 	require("luasnip.loaders.from_snipmate").lazy_load()
 end

lua/plugins/init.lua

@@ -4,7 +4,6 @@ local config = require("plugins.config")
 package_manager.bootstrap()
 package_manager.install_plugins()
 
--- KEEPING
 config.rnvimr()
 config.fzf()
 config.fzf_checkout()
@@ -14,16 +13,15 @@ config.auto_session()
 config.undotree()
 config.indent_blankline()
 config.lualine()
-config.nvim_treesitter()
+config.nvim_treesitter_new()
 config.tokyonight()
-
--- UPDATING
-config.hop()
 config.rustaceanvim()
-
--- LSP STUFF
 config.nvim_autopairs()
 config.luasnip()
 require("plugins.lsp_setup")
 config.null_ls()
-config.tailwind_tools()
+
+-- DEPRECATED/DEAD/OLD
+--config.hop()
+--config.tailwind_tools()
+--config.nvim_treesitter()

lua/plugins/lazy.lua

@@ -22,7 +22,7 @@ function M.install_plugins()
 	require("lazy").setup({
 		spec = {
 			-- NAVIGATION
-			"phaazon/hop.nvim",
+			--"smoka7/hop.nvim",
 
 			-- VIM THEMING
 			"folke/tokyonight.nvim",
@@ -53,11 +53,12 @@ function M.install_plugins()
 
 			-- LSP
 			{
-				"nvim-treesitter/nvim-treesitter",
+				--"nvim-treesitter/nvim-treesitter",
+				"guy176251/nvim-treesitter",
 				build = ":TSUpdate",
+                lazy = false,
 			},
 			"nvim-treesitter/nvim-treesitter-context",
-			"nvim-treesitter/playground",
 			"nvimtools/none-ls.nvim",
 			"windwp/nvim-autopairs",
 			"neovim/nvim-lspconfig",
@@ -87,20 +88,21 @@ function M.install_plugins()
 			-- RUST
 			{
 				"mrcjkb/rustaceanvim",
-				version = "^5", -- Recommended
+				version = "^6", -- Recommended
 				lazy = false, -- This plugin is already lazy
 			},
 
 			-- TAILWIND
-			{
+            -- deprecated
-				"luckasRanarison/tailwind-tools.nvim",
+			--{
-				name = "tailwind-tools",
+			--	"luckasRanarison/tailwind-tools.nvim",
-				build = ":UpdateRemotePlugins",
+			--	name = "tailwind-tools",
-				dependencies = {
+			--	build = ":UpdateRemotePlugins",
-					"nvim-treesitter/nvim-treesitter",
+			--	dependencies = {
-					"neovim/nvim-lspconfig", -- optional
+			--		"nvim-treesitter/nvim-treesitter",
-				},
+			--		"neovim/nvim-lspconfig", -- optional
-			},
+			--	},
+			--},
 
 			-- LUA
 			{

lua/plugins/lsp_setup.lua

@@ -138,25 +138,7 @@ cmp.setup({
 	mapping = cmp.mapping.preset.insert(mapping),
 })
 
-require("mason").setup()
+local lsps = {
-
-local html_filetypes = { "html", "templ", "htmldjango" }
-
-vim.lsp.config("ts_ls", {
-	settings = {
-		implicitProjectConfiguration = {
-			--checkJs = true,
-			experimentalDecorators = true,
-		},
-	},
-})
-
-vim.lsp.config("html", {
-	filetypes = html_filetypes,
-})
-
-vim.lsp.enable({
-	"angular-language-server",
 	"bashls",
 	"clangd",
 	"cssls",
@@ -172,4 +154,38 @@ vim.lsp.enable({
 	"templ",
 	"ts_ls",
 	"zls",
+	"csharp_ls",
+	"intelephense",
+	"php-cs-fixer",
+}
+
+local local_lsp_configs = {
+	"angular-language-server",
+}
+
+require("mason").setup({
+	ensure_installed = lsps,
+	automatic_installation = true,
+	automatic_enable = false,
+	registries = {
+		"github:mason-org/mason-registry",
+		"github:Crashdummyy/mason-registry",
+	},
 })
+
+local html_filetypes = { "html", "templ", "htmldjango" }
+
+vim.lsp.config("ts_ls", {
+	settings = {
+		implicitProjectConfiguration = {
+			checkJs = true,
+			experimentalDecorators = true,
+		},
+	},
+})
+
+vim.lsp.config("html", {
+	filetypes = html_filetypes,
+})
+
+vim.lsp.enable(vim.tbl_extend("force", lsps, local_lsp_configs))