Massive sweeping changes

nixos/home-manager/packages/common-cli.nix

@@ -23,10 +23,21 @@ in
   ];
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [
+      stow
+      unstable.yt-dlp
+      aria2
+      ripgrep
+      wl-clipboard
+      bat
+      btop
 
+      fzf
+      unstable.dwarfs
+      unrar
     ];
 
   programs.neovim = {
@@ -45,7 +56,6 @@ in
     userName = "BuyMyMojo";
     userEmail = "hello+git@buymymojo.net";
     lfs.enable = true;
-    signing.key = "E7B7B8D20C8753C077F9B17119AB7AA462B8AB3B";
     signing.signByDefault = true;
     extraConfig = {
       init = {
@@ -55,10 +65,10 @@ in
     };
   };
 
-  programs.bellado = {
-    enable = true;
-    enableAliases = true;
-  };
+  # programs.bellado = {
+  #   enable = true;
+  #   enableAliases = true;
+  # };
 
   programs.ssh.enable = true;
   programs.ssh.addKeysToAgent = "yes";

nixos/home-manager/packages/common-desktop.nix

@@ -22,15 +22,9 @@ in
     inputs.moonlight.homeModules.default
   ];
 
-  nixpkgs = {
-    overlays = [
-      inputs.moonlight.overlays.default
-    ];
-  };
-
   home.packages =
-    with unstable;
     with inputs;
+    with unstable;
     [
       pkgs.yubioath-flutter
       pkgs.qbittorrent
@@ -50,15 +44,16 @@ in
       pkgs.jetbrains.webstorm
       pkgs.jetbrains.rider
       pkgs.jetbrains.idea-community
-      # unstable.neovim
+      vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured
       # === Editors/Office ===
 
       # === Media ===
       unstable.gimp
       unstable.krita
-      # pkgs.mpv
+      unstable.mpv
       unstable.losslesscut-bin
       unstable.jellyfin-media-player
+      unstable.makemkv
       # === Media ===
 
       unstable.orca-slicer

nixos/home-manager/packages/gamedev.nix

@@ -0,0 +1,40 @@
+{
+  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.file."Godot/current".source = unstable.godot;
+  home.file."Godot/current-mono".source = unstable.godot-mono;
+  home.file."Godot/export-templates/current".source = unstable.godot-export-templates;
+  home.file."Godot/4.3".source = unstable.godot_4_3;
+  home.file."Godot/4.3-mono".source = unstable.godot_4_3-mono;
+  home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates;
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      unstable.godot-mono
+      unstable.godot-export-templates
+      unstable.blender-hip
+      unstable.freecad-wayland
+      pkgs.unityhub
+      pkgs.material-maker
+      unstable.blockbench
+    ];
+}