diff --git a/modules/coding/editor/neovim/default.nix b/modules/coding/editor/neovim/default.nix
index cebb817..04fb3c0 100644
--- a/modules/coding/editor/neovim/default.nix
+++ b/modules/coding/editor/neovim/default.nix
@@ -50,6 +50,8 @@ lib.my.makeHomeProgramConfig {
           typescript
           nodejs
 
+          java-language-server
+
           ripgrep
         ];
       };
diff --git a/modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua b/modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua
index e6b860d..7df6ff3 100644
--- a/modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua
+++ b/modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua
@@ -9,6 +9,7 @@ local servers = {
   "cssls",
   "nixd",
   "html",
+  "java_language_server",
 }
 
 local extra_config = {
@@ -73,7 +74,6 @@ capabilities.textDocument.foldingRange = {
   dynamicRegistration = false,
   lineFoldingOnly = true,
 }
-local lspconfig = require("lspconfig")
 for _, server in ipairs(servers) do
   local extra = extra_config[server] or {}
   local config = {
@@ -82,5 +82,6 @@ for _, server in ipairs(servers) do
   for k, v in pairs(extra) do
     config[k] = v
   end
-  lspconfig[server].setup(config)
+  vim.lsp.config(server, config)
+  vim.lsp.enable(server)
 end
diff --git a/modules/coding/langs/all.nix b/modules/coding/langs/all.nix
index f978163..5aca8ae 100644
--- a/modules/coding/langs/all.nix
+++ b/modules/coding/langs/all.nix
@@ -15,6 +15,7 @@ lib.my.makeSwitch {
       python.enable = true;
       rust.enable = true;
       lua.enable = true;
+      java.enable = true;
       qml.enable = true;
     };
   };
diff --git a/modules/coding/langs/java.nix b/modules/coding/langs/java.nix
new file mode 100644
index 0000000..7393b41
--- /dev/null
+++ b/modules/coding/langs/java.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.my.makeSwitch {
+  inherit config;
+  optionName = "java";
+  optionPath = [
+    "coding"
+    "langs"
+    "java"
+  ];
+  config' = {
+    my.home.home.packages = with pkgs; [
+      openjdk24
+    ];
+  };
+}
diff --git a/modules/desktop/gaming/minecraft.nix b/modules/desktop/gaming/minecraft.nix
index 07df61e..bd6eb46 100644
--- a/modules/desktop/gaming/minecraft.nix
+++ b/modules/desktop/gaming/minecraft.nix
@@ -13,10 +13,8 @@ lib.my.makeSwitch {
     "minecraft"
   ];
   config' = {
-    my.home.home.packages = with pkgs; [
-      hmcl
-
-      openjdk21
+    my.home.home.packages = [
+      pkgs.hmcl
     ];
 
     my.persist.homeDirs = [