Move jdk stuff to common

2024-02-23 14:53:58 +01:00 · 2024-02-23 14:53:58 +01:00 · c64a76b6b3
parent 65aca5a3f5
commit c64a76b6b3
5 changed files with 4 additions and 14 deletions
--- a/home/common-linux.nix
+++ b/home/common-linux.nix
@ -12,6 +12,10 @@ with lib; {
      file # Query file type

      pinentry-gnome
+
+      # Java stuff
+      jdk21
+      sbt
    ] ++ (
      if pkgs.stdenv.isx86_64
      then [
--- a/home/kagami-pc-home.nix
+++ b/home/kagami-pc-home.nix
@ -21,10 +21,6 @@
    texlive.combined.scheme-full
    inkscape # for TeX svg

-    # Java & sbt
-    jdk21
-    sbt
-
    # Gaming stuff
    wineWowPackages.full
    # wine-lol
--- a/home/macbook-nixos.nix
+++ b/home/macbook-nixos.nix
@ -42,10 +42,6 @@ in
    discord

    typora
-
-    # Java & sbt
-    openjdk11
-    sbt
  ]);

  # Graphical set up
--- a/home/nki-framework.nix
+++ b/home/nki-framework.nix
@ -24,9 +24,6 @@
    texlive.combined.scheme-full
    # Note-taking
    rnote
-
-    # Java & sbt
-    jdk19
  ]);

  # Graphical set up
--- a/home/nki-x1c1.nix
+++ b/home/nki-x1c1.nix
@ -24,9 +24,6 @@
    texlive.combined.scheme-full
    # Note-taking
    rnote
-
-    # Java & sbt
-    jdk19
  ]);

  # Graphical set up