diff --git a/applications/devel-kotlin.nix b/applications/devel-kotlin.nix index e9badca..15e7473 100644 --- a/applications/devel-kotlin.nix +++ b/applications/devel-kotlin.nix @@ -1,7 +1,8 @@ -{ config, lib, pkgs, inputs, unstable, ... }: +{ config, lib, pkgs, java, unstable, ... }: { environment.systemPackages = with unstable; [ + java.packages.${system}.semeru-stable kotlin kotlin-native kotlin-language-server diff --git a/flake.lock b/flake.lock index 8e9288d..f63ea63 100644 --- a/flake.lock +++ b/flake.lock @@ -277,6 +277,27 @@ "type": "github" } }, + "java": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1655182547, + "narHash": "sha256-gmkb6l13CVKtlRydDJ9O3sifKtamKLgLdUaEASdQ6Ls=", + "owner": "nathans-flakes", + "repo": "java", + "rev": "8e53bfead6195e4440aef47b2f08b0e7f89b1d4d", + "type": "github" + }, + "original": { + "owner": "nathans-flakes", + "repo": "java", + "type": "github" + } + }, "libnbtplusplus": { "flake": false, "locked": { @@ -618,6 +639,7 @@ "emacs": "emacs", "fenix": "fenix", "home-manager": "home-manager", + "java": "java", "mozilla": "mozilla", "nix-doom-emacs": "nix-doom-emacs", "nixpkgs": "nixpkgs_2", @@ -695,6 +717,21 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6e194b3..541ef61 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,10 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.emacs-overlay.follows = "emacs"; }; + java = { + url = "github:nathans-flakes/java"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -51,6 +55,7 @@ , darwin , polymc , nix-doom-emacs + , java }@attrs: let baseModules = [