diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..246cfd4
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1774386573,
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..e2a5293
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,48 @@
+{
+  description = "new-shapes - Java Swing shape editor";
+
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
+  outputs = { self, nixpkgs }:
+    let
+      # JDK 16 (project target) is non-LTS and unavailable in nixpkgs.
+      # JDK 17 (LTS) is fully backward-compatible with --source 16 --target 16.
+      javaVersion = 17;
+
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+
+      forEachSystem = f:
+        nixpkgs.lib.genAttrs supportedSystems (system: f {
+          pkgs = import nixpkgs {
+            inherit system;
+            overlays = [ self.overlays.default ];
+          };
+        });
+    in
+    {
+      overlays.default = final: prev:
+        let
+          jdk = prev."jdk${toString javaVersion}";
+        in
+        {
+          inherit jdk;
+          # Override Maven to use the same JDK version
+          maven = prev.maven.override { jdk_headless = jdk; };
+        };
+
+      devShells = forEachSystem ({ pkgs }: {
+        default = pkgs.mkShell {
+          packages = with pkgs; [
+            jdk
+            maven
+          ];
+
+          shellHook = ''
+            echo "new-shapes dev shell"
+            echo "  Java: $(java -version 2>&1 | head -1)"
+            echo "  Maven: $(mvn -version 2>&1 | head -1)"
+          '';
+        };
+      });
+    };
+}