Do a TON of organising into seperate files

nixos/home-manager/nixos.nix

@@ -13,6 +13,12 @@
     ./nixos/services.nix
 
     ./packages/gamedev.nix
+    ./packages/gaming.nix
+    ./packages/game-extras.nix
+    ./packages/emulation.nix
+    ./packages/wine.nix
+    ./packages/video-capture.nix
+    ./packages/video-prod.nix
 
     ./packages/common-cli.nix
     ./packages/common-desktop.nix

nixos/home-manager/nixos/packages.nix

@@ -9,12 +9,6 @@
 
 {
 
-  home.file."jdks/zulujdk8".source = pkgs.zulu8;
-  home.file."jdks/zulujdk17".source = pkgs.zulu17;
-  home.file."jdks/zulujdk23".source = pkgs.zulu23;
-
-  home.file."bin/wine".source = unstable.wineWowPackages.waylandFull;
-
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages =
@@ -26,26 +20,6 @@
       pkgs.monero-gui
       unstable.kiwix
 
-      # pkgs.protonplus
-      unstable.pcsx2
-      pkgs.rpcs3
-      unstable.ryubing
-      unstable.torzu
-      pkgs.heroic-unwrapped
-      unstable.ludusavi
-      inputs.shadps4-git.packages."x86_64-linux".default
-
-      unstable.wineWowPackages.waylandFull
-      unstable.winetricks
-      steamtinkerlaunch
-
-      # === Minecraft ===
-      pkgs.prismlauncher
-      # pkgs.zulu8
-      # pkgs.zulu17
-      # pkgs.zulu23
-      # === Minecraft ===
-
       # === CLI ===
       pkgs.rrsync
       pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface
@@ -65,23 +39,13 @@
       pkgs.imagemagick
       # === Image CLI ===
 
-      # === Game perf ===
-      unstable.mangojuice
-      unstable.goverlay
-      # === Game perf ===
-
       # === Dev tooling ===
       # pkgs.rustup
       # === Dev tooling ===
 
       # pkgs.polychromatic
 
-      pkgs.lazydocker
-      pkgs.distrobox
-      pkgs.boxbuddy
 
-      unstable.gpu-screen-recorder-gtk
-      gsr-ui.gpu-screen-recorder-ui
 
       # # You can also create simple shell scripts directly inside your
       # # configuration. For example, this adds a command 'my-hello' to your
@@ -91,25 +55,6 @@
       # '')
     ];
 
-  programs.mangohud = {
-    enable = true;
-    enableSessionWide = true;
-    package = unstable.mangohud;
-  };
-
-  programs.obs-studio = {
-    enable = true;
-    plugins = with pkgs.obs-studio-plugins; [
-      wlrobs
-      obs-vkcapture
-      obs-pipewire-audio-capture
-      obs-teleport
-      obs-source-record
-      obs-source-clone
-      obs-composite-blur
-    ];
-  };
-
   # === ssh ===
   programs.ssh.matchBlocks = {
     "*" = {

nixos/home-manager/packages/emulation.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      unstable.pcsx2
+      unstable.rpcs3
+      unstable.ryubing
+      unstable.torzu
+      inputs.shadps4-git.packages."x86_64-linux".default
+    ];
+}
+

nixos/home-manager/packages/game-extras.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      # === Factorio related ===
+      unstable.yafc-ce
+      unstable.pactorio
+      unstable.factoriolab
+      # === Factorio related ===
+    ];
+}
+

nixos/home-manager/packages/gameing.nix

@@ -0,0 +1,51 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  # === Java versions for MC ===
+  home.file."jdks/zulujdk8".source = pkgs.zulu8;
+  home.file."jdks/zulujdk17".source = pkgs.zulu17;
+  home.file."jdks/zulujdk23".source = pkgs.zulu23;
+  # === Java versions for MC ===
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      # === Minecraft related ===
+      unstable.modrinth-app
+      unstable.prismlauncher
+      # === Minecraft related ===
+
+      unstable.steamtinkerlaunch
+      pkgs.heroic-unwrapped
+      unstable.ludusavi
+
+      # === Game perf ===
+      unstable.mangojuice
+      unstable.goverlay
+      # === Game perf ===
+    ];
+
+  programs.mangohud = {
+    enable = true;
+    enableSessionWide = true;
+    package = unstable.mangohud;
+  };
+}

nixos/home-manager/packages/template.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+
+    ];
+
+}

nixos/home-manager/packages/video-capture.nix

@@ -0,0 +1,42 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      unstable.gpu-screen-recorder-gtk
+      gsr-ui.gpu-screen-recorder-ui
+    ];
+
+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-vkcapture
+      obs-pipewire-audio-capture
+      obs-teleport
+      obs-source-record
+      obs-source-clone
+      obs-composite-blur
+    ];
+  };
+
+}

nixos/home-manager/packages/video-prod.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      unstable.svt-av1-psy
+      unstable.ffmpeg-full
+      unstable.ab-av1
+      unstable.whisper-cpp-vulkan
+      unstable.video-compare
+    ];
+
+}

nixos/home-manager/packages/virtualisation.nix

@@ -0,0 +1,30 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      pkgs.lazydocker
+      pkgs.distrobox
+      pkgs.boxbuddy
+    ];
+
+}

nixos/home-manager/packages/wine.nix

@@ -0,0 +1,31 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      home.file."bin/wine".source = unstable.wineWowPackages.waylandFull;
+      
+      unstable.wineWowPackages.waylandFull
+      unstable.winetricks
+    ];
+
+}