diff --git a/pkgs/afk-cmds/afk-cmds.nix b/pkgs/afk-cmds.nix
similarity index 100%
rename from pkgs/afk-cmds/afk-cmds.nix
rename to pkgs/afk-cmds.nix
diff --git a/pkgs/parrot/parrot.nix b/pkgs/parrot.nix
similarity index 100%
rename from pkgs/parrot/parrot.nix
rename to pkgs/parrot.nix
diff --git a/pkgs/t-rex/t-rex.nix b/pkgs/t-rex.nix
similarity index 100%
rename from pkgs/t-rex/t-rex.nix
rename to pkgs/t-rex.nix
diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix
index 78c1cf2..19226f6 100644
--- a/systems/game-laptop/default.nix
+++ b/systems/game-laptop/default.nix
@@ -22,26 +22,32 @@ _: {
     "steam"
     "steam-original"
   ];
-  environment.systemPackages = [
-    pkgs.heroic
-    pkgs.legendary-gl
-    pkgs.prismlauncher
-    pkgs.pcmanfm #file manager
-    pkgs.librewolf #best browser
-    pkgs.obs-studio
-    pkgs.vlc
-    # wrap webcord to remove state file https://github.com/SpacingBat3/WebCord/issues/360
-    (pkgs.symlinkJoin {
-      name = "webcord-wrapper";
-      nativeBuildInputs = [pkgs.makeWrapper];
-      paths = [
-        pkgs.webcord
-      ];
-      postBuild = ''
-        wrapProgram "$out/bin/webcord" --run  'rm -f $HOME/.config/WebCord/windowState.json'
-      '';
-    })
-  ];
+  environment = {
+    systemPackages = [
+      pkgs.heroic
+      pkgs.legendary-gl
+      (pkgs.prismlauncher.override {jdks = [];})
+      pkgs.pcmanfm #file manager
+      pkgs.librewolf #best browser
+      pkgs.obs-studio
+      pkgs.vlc
+      # wrap webcord to remove state file https://github.com/SpacingBat3/WebCord/issues/360
+      (pkgs.symlinkJoin {
+        name = "webcord-wrapper";
+        nativeBuildInputs = [pkgs.makeWrapper];
+        paths = [
+          pkgs.webcord
+        ];
+        postBuild = ''
+          wrapProgram "$out/bin/webcord" --run  'rm -f $HOME/.config/WebCord/windowState.json'
+        '';
+      })
+    ];
+    etc = {
+      "jdks/17".source = pkgs.openjdk17;
+      "jdks/8".source = pkgs.openjdk8;
+    };
+  };
   networking = {
     hostName = "game-laptop";
     networkmanager.enable = true;
diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix
index 432b9bf..3d252b8 100644
--- a/systems/gerg-desktop/default.nix
+++ b/systems/gerg-desktop/default.nix
@@ -30,42 +30,48 @@ inputs: {
     videoDrivers = ["nvidia" "amdgpu"];
   };
 
-  nixpkgs.allowedUnfree = [
-    "nvidia-x11"
-    "steam"
-    "steam-original"
-  ];
+  nixpkgs = {
+    allowedUnfree = [
+      "nvidia-x11"
+      "steam"
+      "steam-original"
+    ];
 
-  nixpkgs.overlays = [
-    inputs.nvim-flake.overlays.default
-  ];
+    overlays = [
+      inputs.nvim-flake.overlays.default
+    ];
+  };
   nix.settings.system-features = ["kvm" "big-parallel" "nixos-test" "benchmark"];
 
-  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";
-      nativeBuildInputs = [pkgs.makeWrapper];
-      paths = [
-        pkgs.webcord
-      ];
-      postBuild = ''
-        wrapProgram "$out/bin/webcord" --run  'rm -f $HOME/.config/WebCord/windowState.json'
-      '';
-    })
-  ];
+  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.ripgrep
+      pkgs.lutris
+      pkgs.xautoclick
+      # wrap webcord to remove state file https://github.com/SpacingBat3/WebCord/issues/360
+      (pkgs.symlinkJoin {
+        name = "webcord-wrapper";
+        nativeBuildInputs = [pkgs.makeWrapper];
+        paths = [
+          pkgs.webcord
+        ];
+        postBuild = ''
+          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;