diff --git a/home/progs/steam-shortcuts.nix b/home/progs/steam-shortcuts.nix index 5e031e9..7ff527c 100644 --- a/home/progs/steam-shortcuts.nix +++ b/home/progs/steam-shortcuts.nix @@ -24,6 +24,11 @@ Icon = "${pkgs.prismlauncher}/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg"; Tags = [ "Game" ]; } + { + AppName = "FH5 Car Table"; + Exe = "${pkgs.callPackage ../util/fh5-car-table.nix { }}/bin/fh5-car-table"; + Tags = [ "Utility" ]; + } ]; }; } diff --git a/home/util/fh5-car-table.nix b/home/util/fh5-car-table.nix new file mode 100644 index 0000000..1b4531b --- /dev/null +++ b/home/util/fh5-car-table.nix @@ -0,0 +1,26 @@ +{ + stdenvNoCC, + fetchurl, + makeWrapper, + protontricks, +}: +stdenvNoCC.mkDerivation { + pname = "fh5-car-table"; + version = "2.1"; + + src = fetchurl { + url = "https://github.com/ForzaMods/Car-Table/releases/download/2.1/Car-Table.exe"; + sha256 = "1r0g0cjmjq4g0vmhj7g1hmm0n3chp3x66m4nfyd6rj1a1mdw5dv9"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -m 755 $src $out/bin/Car-Table.exe + makeWrapper ${protontricks}/bin/protontricks-launch $out/bin/fh5-car-table \ + --add-flags "--appid 1551360 $out/bin/Car-Table.exe" + ''; +} diff --git a/hosts/yarn/default.nix b/hosts/yarn/default.nix index 1ff8802..be2bbee 100644 --- a/hosts/yarn/default.nix +++ b/hosts/yarn/default.nix @@ -125,7 +125,7 @@ defaultCompatTool = "proton_10"; apps."fh5" = { id = 1551360; - compatTool = "proton_experimental"; + compatTool = "proton_11"; launchOptions.env = { # OptiScaler FSR 4 INT8 path on this RDNA 3 (Navi 32) box. # PROTON_FSR4_UPGRADE opts FH5 into Proton's FSR 4 DLL upgrade; diff --git a/hosts/yarn/forza-trigger/python-packages.nix b/hosts/yarn/forza-trigger/python-packages.nix index e7cf7f1..e2744fc 100644 --- a/hosts/yarn/forza-trigger/python-packages.nix +++ b/hosts/yarn/forza-trigger/python-packages.nix @@ -34,7 +34,6 @@ rec { hash = "sha256-yy1MQeRPqaLvoXaAigQd3gPFsFLbwKqrD4mP2zQqcFw="; }; - # Library bug fix: trigger-effect params 8-10 are never propagated to # the OUT report. effect.vibration() puts the frequency in param9, so # without this patch every vibration call ships frequency=0 to the diff --git a/hosts/yarn/home.nix b/hosts/yarn/home.nix index eef39bf..7dd1f50 100644 --- a/hosts/yarn/home.nix +++ b/hosts/yarn/home.nix @@ -12,6 +12,7 @@ home.packages = with pkgs; [ protontricks + (pkgs.callPackage ../../home/util/fh5-car-table.nix { }) # https://github.com/NixOS/nixpkgs/pull/339370#issuecomment-2731336341 bs-manager ];