From 54e41ea1c56504d4345891bb0a1a1a4ded955b70 Mon Sep 17 00:00:00 2001
From: Sebastian Olsson <sebastian.olsson@teliacompany.com>
Date: Tue, 7 Jan 2025 14:36:23 +0100
Subject: [PATCH] Added support for java

---
 .config/kitty/kitty.conf                          |  2 +-
 .config/nvim/lazy-lock.json                       | 11 +++++++++--
 .config/nvim/lua/custom/plugins/nvim-java.lua     | 14 ++++++++++++++
 .config/nvim/lua/kickstart/plugins/treesitter.lua |  1 +
 .zshrc                                            |  2 ++
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 .config/nvim/lua/custom/plugins/nvim-java.lua

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index c70865f..b022ce8 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1345,7 +1345,7 @@
 #: kitty will cycle through various known editors (vim, emacs, etc.)
 #: and take the first one that exists on your system.
 
-# close_on_child_death no
+close_on_child_death yes
 
 #: Close the window when the child process (usually the shell) exits.
 #: With the default value no, the terminal will remain open when the
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index ba481a2..a4eb5ea 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -6,7 +6,7 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "codeium.nvim": { "branch": "main", "commit": "aa06fa21dd518a81b84aa468e2f52051cbd45f12" },
+  "codeium.nvim": { "branch": "main", "commit": "f74f999ec5b383dc7a67c0298051ec2be2b17cab" },
   "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" },
   "feline.nvim": { "branch": "main", "commit": "c97c17dc56ca3cf2b9b9192c3447fc59347e8c0d" },
   "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
@@ -15,7 +15,8 @@
   "go.nvim": { "branch": "master", "commit": "2aa81c62bd58bb013f7b472297c2e8038de827d3" },
   "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
@@ -29,6 +30,11 @@
   "nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" },
   "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" },
   "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
+  "nvim-java": { "branch": "main", "commit": "e8e84413ca03e7d0541921e795b2e6bf8801f186" },
+  "nvim-java-core": { "branch": "main", "commit": "22eca6b90b7e209299d99cbf60421f0ffdae5629" },
+  "nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" },
+  "nvim-java-refactor": { "branch": "main", "commit": "ea1420fed5463c9cc976c2b4175f434b3646f0f7" },
+  "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" },
   "nvim-lspconfig": { "branch": "master", "commit": "dd329912c8d446240584a2dbcd3802af3a19105a" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
@@ -38,6 +44,7 @@
   "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
+  "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
diff --git a/.config/nvim/lua/custom/plugins/nvim-java.lua b/.config/nvim/lua/custom/plugins/nvim-java.lua
new file mode 100644
index 0000000..755c974
--- /dev/null
+++ b/.config/nvim/lua/custom/plugins/nvim-java.lua
@@ -0,0 +1,14 @@
+return {
+	{
+		"nvim-java/nvim-java",
+		jdtls = function()
+			require("java").setup({
+				-- Your custom jdtls settings goes here
+			})
+
+			require("lspconfig").jdtls.setup({
+				-- Your custom nvim-java configuration goes here
+			})
+		end,
+	},
+}
diff --git a/.config/nvim/lua/kickstart/plugins/treesitter.lua b/.config/nvim/lua/kickstart/plugins/treesitter.lua
index bd1ca9b..cee488f 100644
--- a/.config/nvim/lua/kickstart/plugins/treesitter.lua
+++ b/.config/nvim/lua/kickstart/plugins/treesitter.lua
@@ -18,6 +18,7 @@ return {
 				"gdscript",
 				"godot_resource",
 				"gdshader",
+				"java",
 			},
 			-- Autoinstall languages that are not installed
 			auto_install = true,
diff --git a/.zshrc b/.zshrc
index b5d355c..104549d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -180,3 +180,5 @@ fi
 
 # Created by `pipx` on 2024-09-15 07:28:13
 export PATH="$PATH:/Users/sebastian/.local/bin:$HOME/Library/Android/sdk/platform-tools"
+export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
+export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"