diff --git a/flake.lock b/flake.lock index 2e6d4128..da6393b8 100644 --- a/flake.lock +++ b/flake.lock @@ -1465,11 +1465,11 @@ ] }, "locked": { - "lastModified": 1764310947, - "narHash": "sha256-iOzr6zahmX+bb/OXQopueTKc8Ae7ZGz//9MlavuNsCU=", + "lastModified": 1768712011, + "narHash": "sha256-FADyF0GK2jug7R7SEM/gc/rMVhvFhnYu/fieYX1wnqc=", "owner": "kittywitch", "repo": "mewtris", - "rev": "d6cce244bd3bed11bea2d01ace6340ede9fccc22", + "rev": "f4dcfadd7a3112d9a476d07679bf562f5e77e5c7", "type": "github" }, "original": { diff --git a/nixos/profiles/gaming/Gw.bat b/nixos/profiles/gaming/Gw.bat new file mode 100755 index 00000000..111c79e7 --- /dev/null +++ b/nixos/profiles/gaming/Gw.bat @@ -0,0 +1,18 @@ +@echo on +set GW_DIR=%1 +set GW_EXE=Gw.exe +set GWT_EXE=GWToolbox.exe + +echo "Setting UTF-8..." +chcp 65001 > nul + +echo "Launching GW1..." +cd /d %GW_DIR% +start /b %GW_EXE% + +timeout /t 5 /nobreak > NUL + +echo "Launching toolbox..." +start /b %GWT_EXE% + +exit diff --git a/nixos/profiles/gaming/wine.nix b/nixos/profiles/gaming/wine.nix index 44fb2c36..db1db071 100644 --- a/nixos/profiles/gaming/wine.nix +++ b/nixos/profiles/gaming/wine.nix @@ -166,20 +166,6 @@ in { vnExe = "./HANA9.exe"; }; - # - # VRChat utilities - # - - vrosc = mkMerge [ - protonCommon - rec { - long_name = "VR OSC"; - prefixFolder = gameStorage + "/Steam Library/steamapps/compatdata/438100"; - gameFolder = gameStorage + "/Steam Library/steamapps/common/VRChat"; - gameExecutable = gameFolder + "/VROSCSetup.exe"; - } - ]; - # # Guild Warses # @@ -187,15 +173,26 @@ in { gw1 = mkMerge [ protonCommon #wineCommon - rec { + (let + prefixFolder = gameStorage + "/guild-wars"; + gameFolder' = prefixFolder + "/drive_c/Program Files/Guild Wars"; + in rec { + enableGamemode = lib.mkForce false; #variant = mkForce "PROTON_CACHYOS"; #variant = mkForce "PROTON_GE"; + variant = mkForce "PROTON_VRC"; long_name = "Guild Wars 1"; - prefixFolder = gameStorage + "/guild-wars"; - gameFolder = prefixFolder + "/drive_c/Program Files/Guild Wars"; - gameExecutable = gameFolder + "/Gw.exe"; + inherit prefixFolder; + gameFolder = prefixFolder; + #gameExecutable = gameFolder + "/Gw.exe"; + gameExecutable = "./drive_c/cmd.exe"; + gameArguments = [ + "/k" + "C:/script.bat" + gameFolder' + ]; environments = ["vkbasalt"]; - } + }) ]; gw2 = mkMerge [ protonCommon @@ -404,6 +401,8 @@ in { // { "Games/battlenet/drive_c/script.bat".source = ./bnet_script.bat; "Games/battlenet/drive_c/cmd.exe".source = ./reactos_cmd.exe; + "Games/guild-wars/drive_c/script.bat".source = ./Gw.bat; + "Games/guild-wars/drive_c/cmd.exe".source = ./reactos_cmd.exe; # https://learnjapanese.moe/vn-linux/ "Games/VNs/drive_c/script.bat".source = ./vn_script.bat; "Games/VNs/drive_c/cmd.exe".source = ./reactos_cmd.exe;