Move jdk stuff to common

This commit is contained in:
Natsu Kagami 2024-02-23 14:53:58 +01:00
parent 65aca5a3f5
commit c64a76b6b3
Signed by: nki
GPG key ID: 55A032EB38B49ADB
5 changed files with 4 additions and 14 deletions

View file

@ -12,6 +12,10 @@ with lib; {
file # Query file type file # Query file type
pinentry-gnome pinentry-gnome
# Java stuff
jdk21
sbt
] ++ ( ] ++ (
if pkgs.stdenv.isx86_64 if pkgs.stdenv.isx86_64
then [ then [

View file

@ -21,10 +21,6 @@
texlive.combined.scheme-full texlive.combined.scheme-full
inkscape # for TeX svg inkscape # for TeX svg
# Java & sbt
jdk21
sbt
# Gaming stuff # Gaming stuff
wineWowPackages.full wineWowPackages.full
# wine-lol # wine-lol

View file

@ -42,10 +42,6 @@ in
discord discord
typora typora
# Java & sbt
openjdk11
sbt
]); ]);
# Graphical set up # Graphical set up

View file

@ -24,9 +24,6 @@
texlive.combined.scheme-full texlive.combined.scheme-full
# Note-taking # Note-taking
rnote rnote
# Java & sbt
jdk19
]); ]);
# Graphical set up # Graphical set up

View file

@ -24,9 +24,6 @@
texlive.combined.scheme-full texlive.combined.scheme-full
# Note-taking # Note-taking
rnote rnote
# Java & sbt
jdk19
]); ]);
# Graphical set up # Graphical set up