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

Compare commits

base: SK-Development-Studios:b24fa7ce4040b87c45ba017d3523e89ff160723f
Branches Tags
SK-Development-Studios:main
..
compare: SK-Development-Studios:184d58b5b592176d83c4b18ea4bf2c352b971afe
Branches Tags
SK-Development-Studios:main

No commits in common. "b24fa7ce4040b87c45ba017d3523e89ff160723f" and "184d58b5b592176d83c4b18ea4bf2c352b971afe" have entirely different histories.
b24fa7ce40 ... 184d58b5b5

3 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,12 +16,6 @@ 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) [
@ -41,7 +35,7 @@ in
groups.steam = { }; groups.steam = { };
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d ${cfg.dataDir}/reforger 0755 steam steam -" # "d /var/lib/steam 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 -"
@ -53,17 +47,16 @@ 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 = "${lib.getExe pkgs.steam-run} ${cfg.dataDir}/reforger/ArmaReforgerServer -config ${cfg.dataDir}/reforger/Configs/default.json -maxFPS 60"; ExecStart = "${pkgs.arma-scripts}/scripts/start.sh";
}; };
}; };
}; };

5
modules/nixos/default.nix
View file

@ -5,9 +5,4 @@
imports = [ imports = [
flake.inputs.self.nixosModules.common flake.inputs.self.nixosModules.common
]; ];
environment.systemPackages = with pkgs; [
tmux
neovim
];
} }

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.4"; rev = "v0.0.2";
sha256 = "sha256-DVUACc7VufT3FcUxBTcAJAoH6mIE3XUTCI6ftpgJT3c="; sha256 = "sha256-bZaEkrlAuQCm9/AEt+Lkzxf5FOiyvYb6jclG5xeeBok=";
} }