Latest configuration changes

lua/plugins/dev-tools.lua

@@ -25,6 +25,7 @@ return {
 		"f-person/git-blame.nvim",
 		opts = {
 			enabled = false,
+			message_template = "<<sha>> • <author> • <summary> • <date>",
 		},
 	},
 

lua/plugins/editor.lua

@@ -12,11 +12,12 @@ return {
 	},
 	"godlygeek/tabular",
 	"tpope/vim-sleuth",
-	"norcalli/nvim-colorizer.lua",
+	"catgoose/nvim-colorizer.lua",
 	{ "ixru/nvim-markdown", ft = "markdown" },
 	"KeitaNakamura/tex-conceal.vim",
 	"skywind3000/asyncrun.vim",
 	"airblade/vim-gitgutter",
 	"tpope/vim-abolish",
 	"dhruvasagar/vim-table-mode",
-}
+}
+

lua/plugins/formatting.lua

@@ -3,29 +3,26 @@
 return {
 	{
 		"stevearc/conform.nvim",
-		setup = {
-			formatters = {
-				black = {
-					command = "black",
-					prepend_args = { "--line-length", "100" },
-				},
-				"prettier",
-				formatters = {
-					golines = {
-						args = {
-							"--max-len=100",
-							"--base-formatter=gofmt",
-						},
-					},
-				},
-			},
-		},
 		opts = {
 			notify_on_error = false,
 			format_on_save = {
 				timeout_ms = 2500,
 				lsp_fallback = true,
 			},
+			formatters = {
+				black = {
+					prepend_args = { "--line-length", "100" },
+				},
+				beautysh = {
+					prepend_args = { "--indent-size", "2" },
+				},
+				golines = {
+					prepend_args = {
+						"--max-len=100",
+						"--base-formatter=gofmt",
+					},
+				},
+			},
 			formatters_by_ft = {
 				lua = { "stylua" },
 				python = { "black" },
@@ -33,7 +30,7 @@ return {
 				c = { "clang-format" },
 				sh = { "beautysh" },
 				tex = { "latexindent" },
-				java = { "java" },
+				java = { "google-java-format" },
 				javascript = { "prettier" },
 				typescript = { "prettier" },
 				typescriptreact = { "prettier" },

lua/plugins/lsp.lua

@@ -11,7 +11,7 @@ return {
 			local root_dir = require("jdtls.setup").find_root({ ".git", "mvnw", "gradlew" })
 
 			-- Path to your exported Eclipse/IntelliJ style xml
-			local style_path = vim.fn.expand("~/.config/nvim/GoogleStyle.xml")
+			local style_path = vim.fn.expand("~/.config/nvim/formatters/eclipse-java-google-style.xml")
 
 			local java_home = os.getenv("NVIM_JDTLS_JAVA_HOME")
 
@@ -42,10 +42,7 @@ return {
 				settings = {
 					java = {
 						format = {
-							settings = {
-								url = "file://" .. style_path,
-								profile = "GoogleStyle", -- must match the profile inside the xml
-							},
+							enabled = false,
 						},
 					},
 				},

lua/plugins/ui.lua

@@ -62,6 +62,8 @@ return {
 
 	{
 		"nvim-treesitter/nvim-treesitter",
+		branch = "master",
+		tag = "v0.9.3",
 		build = ":TSUpdate",
 		config = function()
 			require("nvim-treesitter.configs").setup({