commit msgs are hard

systems/game-laptop/default.nix

@@ -22,10 +22,11 @@ _: {
     "steam"
     "steam-original"
   ];
-  environment.systemPackages = [
+  environment = {
+    systemPackages = [
       pkgs.heroic
       pkgs.legendary-gl
-    pkgs.prismlauncher
+      (pkgs.prismlauncher.override {jdks = [];})
       pkgs.pcmanfm #file manager
       pkgs.librewolf #best browser
       pkgs.obs-studio
@@ -42,6 +43,11 @@ _: {
         '';
       })
     ];
+    etc = {
+      "jdks/17".source = pkgs.openjdk17;
+      "jdks/8".source = pkgs.openjdk8;
+    };
+  };
   networking = {
     hostName = "game-laptop";
     networkmanager.enable = true;

systems/gerg-desktop/default.nix

@@ -30,30 +30,30 @@ inputs: {
     videoDrivers = ["nvidia" "amdgpu"];
   };
 
-  nixpkgs.allowedUnfree = [
+  nixpkgs = {
+    allowedUnfree = [
       "nvidia-x11"
       "steam"
       "steam-original"
     ];
 
-  nixpkgs.overlays = [
+    overlays = [
       inputs.nvim-flake.overlays.default
     ];
+  };
   nix.settings.system-features = ["kvm" "big-parallel" "nixos-test" "benchmark"];
 
-  environment.systemPackages = [
+  environment = {
+    systemPackages = [
       pkgs.bitwarden #store stuff
       pkgs.qbittorrent #steal stuff
       pkgs.pavucontrol #gui volume control
       pkgs.pcmanfm #file manager
       pkgs.librewolf #best browser
       pkgs.vlc #play stuff
-    pkgs.neovide #gui neovim
       pkgs.ripgrep
       pkgs.lutris
-    pkgs.prismlauncher
       pkgs.xautoclick
-    inputs.master.legacyPackages.${pkgs.system}.mullvad-browser
       # wrap webcord to remove state file https://github.com/SpacingBat3/WebCord/issues/360
       (pkgs.symlinkJoin {
         name = "webcord-wrapper";
@@ -65,7 +65,13 @@ inputs: {
           wrapProgram "$out/bin/webcord" --run  'rm -f $HOME/.config/WebCord/windowState.json'
         '';
       })
+      (pkgs.prismlauncher.override {jdks = [];})
     ];
+    etc = {
+      "jdks/17".source = pkgs.openjdk17;
+      "jdks/8".source = pkgs.openjdk8;
+    };
+  };
 
   networking = {
     useDHCP = false;