From 757c0a2b4bc8225a85ff211cbf49ead4232cde78 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Sat, 14 Feb 2026 17:40:39 +0100
Subject: [PATCH] chore(java): Update SDK to 25

---
 java/flake.lock | 70 ++++++++++++++++++++++++++++++++++++++++++++++++-
 java/flake.nix  | 20 ++++++++++----
 2 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/java/flake.lock b/java/flake.lock
index 2e26765..0007c84 100644
--- a/java/flake.lock
+++ b/java/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -18,7 +34,43 @@
         "type": "github"
       }
     },
+    "nix-jetbrains-plugins": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1769853456,
+        "narHash": "sha256-8h3p12GjiDOP7YDVS5Gx/bqjPQL4tFdDr90Ki7Qtglw=",
+        "owner": "theCapypara",
+        "repo": "nix-jetbrains-plugins",
+        "rev": "1d496fa90ada916bd926228131f8ad04d7a854aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theCapypara",
+        "repo": "nix-jetbrains-plugins",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1767640445,
+        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1770689213,
         "narHash": "sha256-N6JiSpfi0s8NjUTnjwo3c+YAmvYhCDzjCKCrTUC97xM=",
@@ -37,7 +89,8 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nix-jetbrains-plugins": "nix-jetbrains-plugins",
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
@@ -54,6 +107,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/java/flake.nix b/java/flake.nix
index 480265f..0e46897 100644
--- a/java/flake.nix
+++ b/java/flake.nix
@@ -1,10 +1,13 @@
 {
   description = "Java Flake";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    nix-jetbrains-plugins.url = "github:theCapypara/nix-jetbrains-plugins";
+  };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, nix-jetbrains-plugins }:
   flake-utils.lib.eachDefaultSystem
   ( system:
   let
@@ -12,14 +15,21 @@
       inherit system;
       config.allowUnfree = true;
     };
+
+    pluginList = [
+      #"com.github.copilot" # Currently broken
+      "com.google.tools.ij.aiplugin"
+      "IdeaVIM"
+      "nix-idea"
+    ];
   in {
     devShells.default = pkgs.mkShell {
       packages = with pkgs; [
-        jdk
+        jdk25_headless
         gradle
 
         # You might want to use your own IDE.
-        (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ])
+        (nix-jetbrains-plugins.lib.buildIdeWithPlugins pkgs "idea" pluginList)
       ];
     };
   });