From d512b64f41b397b5a0626d55d4c013ebf5e88baa Mon Sep 17 00:00:00 2001
From: Jermeiah S <owner@arouzing.xyz>
Date: Tue, 1 Jul 2025 23:02:24 -0400
Subject: [PATCH] fix: arma now is run directly packages are global

---
 modules/nixos/common/arma.nix     | 23 +++++++++++++++--------
 packages/arma-scripts/default.nix |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/modules/nixos/common/arma.nix b/modules/nixos/common/arma.nix
index 01e67c4..5b29959 100644
--- a/modules/nixos/common/arma.nix
+++ b/modules/nixos/common/arma.nix
@@ -16,6 +16,12 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [
+      steamcmd
+      curl
+      steam-run
+    ];
     nixpkgs.config.allowUnfreePredicate =
       pkg:
       builtins.elem (lib.getName pkg) [
@@ -35,7 +41,7 @@ in
       groups.steam = { };
     };
     systemd.tmpfiles.rules = [
-      # "d /var/lib/steam 0755 steam steam -"
+      "d ${cfg.dataDir}/reforger 0755 steam steam -"
       "d ${cfg.dataDir}/reforger/configs 0755 steam steam -"
       "d ${cfg.dataDir}/reforger/profile 0755 steam steam -"
       "d ${cfg.dataDir}/reforger/workshop 0755 steam steam -"
@@ -47,16 +53,17 @@ in
         environment = {
           ARMA_DIR = "${cfg.dataDir}";
         };
-        path = with pkgs; [
-          curl
-          steamcmd
-          steam-run
-        ];
-        preStart = "${pkgs.arma-scripts}/scripts/update.sh";
+        # path = with pkgs; [
+        #   curl
+        #   steamcmd
+        #   steam-run
+        # ];
+        # preStart = "${pkgs.arma-scripts}/scripts/update.sh";
         serviceConfig = {
           User = "steam";
+          TimeoutStartSec = "infinity";
           WorkingDirectory = "${cfg.dataDir}/reforger";
-          ExecStart = "${pkgs.arma-scripts}/scripts/start.sh";
+          ExecStart = "${lib.getExe pkgs.steam-run} ${cfg.dataDir}/reforger/ArmaReforgerServer -config ${cfg.dataDir}/reforger/Configs/default.json -maxFPS 60";
         };
       };
     };
diff --git a/packages/arma-scripts/default.nix b/packages/arma-scripts/default.nix
index eac0e8a..aeee124 100644
--- a/packages/arma-scripts/default.nix
+++ b/packages/arma-scripts/default.nix
@@ -3,6 +3,6 @@ fetchFromGitea {
   domain = "git.skdevstudios.com";
   owner = "SK-Development-Studios";
   repo = "ground-zero-conflict-configuration";
-  rev = "v0.0.2";
-  sha256 = "sha256-bZaEkrlAuQCm9/AEt+Lkzxf5FOiyvYb6jclG5xeeBok=";
+  rev = "v0.0.4";
+  sha256 = "sha256-DVUACc7VufT3FcUxBTcAJAoH6mIE3XUTCI6ftpgJT3c=";
 }