SK-Development-Studios/Nixos-Configuration
2
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: arma now is run directly packages are global

Browse source
This commit is contained in:
Jermeiah S 2025-07-01 23:02:24 -04:00
parent 184d58b5b5
commit d512b64f41
No known key found for this signature in database
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/nixos/common/arma.nix
View file

@ -16,6 +16,12 @@ in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
steamcmd
curl
steam-run
];
nixpkgs.config.allowUnfreePredicate = nixpkgs.config.allowUnfreePredicate =
pkg: pkg:
builtins.elem (lib.getName pkg) [ builtins.elem (lib.getName pkg) [
@ -35,7 +41,7 @@ in
groups.steam = { }; groups.steam = { };
}; };
systemd.tmpfiles.rules = [ 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/configs 0755 steam steam -"
"d ${cfg.dataDir}/reforger/profile 0755 steam steam -" "d ${cfg.dataDir}/reforger/profile 0755 steam steam -"
"d ${cfg.dataDir}/reforger/workshop 0755 steam steam -" "d ${cfg.dataDir}/reforger/workshop 0755 steam steam -"
@ -47,16 +53,17 @@ in
environment = { environment = {
ARMA_DIR = "${cfg.dataDir}"; ARMA_DIR = "${cfg.dataDir}";
}; };
path = with pkgs; [ # path = with pkgs; [
curl # curl
steamcmd # steamcmd
steam-run # steam-run
]; # ];
preStart = "${pkgs.arma-scripts}/scripts/update.sh"; # preStart = "${pkgs.arma-scripts}/scripts/update.sh";
serviceConfig = { serviceConfig = {
User = "steam"; User = "steam";
TimeoutStartSec = "infinity";
WorkingDirectory = "${cfg.dataDir}/reforger"; 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";
}; };
}; };
}; };

4
packages/arma-scripts/default.nix
View file

@ -3,6 +3,6 @@ fetchFromGitea {
domain = "git.skdevstudios.com"; domain = "git.skdevstudios.com";
owner = "SK-Development-Studios"; owner = "SK-Development-Studios";
repo = "ground-zero-conflict-configuration"; repo = "ground-zero-conflict-configuration";
rev = "v0.0.2"; rev = "v0.0.4";
sha256 = "sha256-bZaEkrlAuQCm9/AEt+Lkzxf5FOiyvYb6jclG5xeeBok="; sha256 = "sha256-DVUACc7VufT3FcUxBTcAJAoH6mIE3XUTCI6ftpgJT3c=";
} }