From b659d61c26ee217f3fb22297e192b5af266d3011 Mon Sep 17 00:00:00 2001
From: Prabhat Maurya <prabhat@zlts.org>
Date: Tue, 19 May 2026 11:35:28 +0530
Subject: [PATCH] update

---
 lua/user/comment.lua           |  9 +++++++--
 lua/user/java.lua              |  1 +
 lua/user/lsp_servers/jdtls.lua |  3 +--
 lua/user/treesitter.lua        | 19 -------------------
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/lua/user/comment.lua b/lua/user/comment.lua
index a384c03..82efea6 100644
--- a/lua/user/comment.lua
+++ b/lua/user/comment.lua
@@ -7,11 +7,16 @@ end
 
 require("Comment").setup({
 	toggler = {
-		line = "<leader>kk",
-		block = "<leader>bb",
+		line = "<leader>k",
+		block = "<leader>b",
 	},
 	opleader = {
 		line = "<leader>k",
 		block = "<leader>b",
 	},
+	-- Bypass Comment.nvim's treesitter path (broken on Neovim 0.12+)
+	-- and use Neovim's native commentstring instead (set correctly per filetype)
+	pre_hook = function()
+		return vim.bo.commentstring
+	end,
 })
diff --git a/lua/user/java.lua b/lua/user/java.lua
index b7394d2..4bf45af 100644
--- a/lua/user/java.lua
+++ b/lua/user/java.lua
@@ -18,6 +18,7 @@ vim.api.nvim_create_autocmd("FileType", {
     local config = {
       cmd = {
         "jdtls",
+        "--java-executable=/usr/lib/jvm/java-21-openjdk-amd64/bin/java",
         "--jvm-arg=-javaagent:" .. lombok_path,
       },
       root_dir = root_dir,
diff --git a/lua/user/lsp_servers/jdtls.lua b/lua/user/lsp_servers/jdtls.lua
index 16f1fec..ab412e4 100644
--- a/lua/user/lsp_servers/jdtls.lua
+++ b/lua/user/lsp_servers/jdtls.lua
@@ -1,7 +1,6 @@
 -- 1. Setup paths and capabilities
 local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
--- local java_bin = "/usr/lib/jvm/java-21-openjdk/bin/java"
-local java_bin = "/usr/bin/java"
+local java_bin = "/usr/lib/jvm/java-21-openjdk-amd64/bin/java"
 local jdtls_path = vim.fn.stdpath("data") .. "/mason/packages/jdtls"
 local jdtls_launcher_jar = vim.fn.glob(jdtls_path .. "/plugins/org.eclipse.equinox.launcher_*.jar")
 local lombok_jar = jdtls_path .. "/lombok.jar"
diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua
index d5f65cb..0cea3f5 100644
--- a/lua/user/treesitter.lua
+++ b/lua/user/treesitter.lua
@@ -11,23 +11,4 @@ require("nvim-treesitter").setup({
 		"kotlin",
 		"go",
 	},
-	highlight = {
-		enable = true,
-		use_language_tree = true,
-	},
-	incremental_selection = {
-		enable = true,
-	},
-	indent = {
-		enable = true,
-	},
-	context_commentstring = {
-		enable = true,
-	},
-	autopairs = {
-		enable = true,
-	},
-	rainbow = {
-		enable = true,
-	},
 })