diff --git a/.gitignore b/.gitignore index b4b80d9..249564b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ data2 data result .direnv -arma-reforger-tofu.qcow2 diff --git a/configurations/nixos/arma-reforger-tofu/default.nix b/configurations/nixos/arma-reforger-tofu/default.nix index a12f61d..1112bf3 100644 --- a/configurations/nixos/arma-reforger-tofu/default.nix +++ b/configurations/nixos/arma-reforger-tofu/default.nix @@ -3,7 +3,6 @@ modulesPath, config, pkgs, - lib, ... }: @@ -14,15 +13,40 @@ in { imports = [ self.nixosModules.default - # "${modulesPath}/virtualisation/lxc-container.nix" + "${modulesPath}/virtualisation/lxc-container.nix" + ]; + # Create steam user + users = { + users.steam = { + isNormalUser = true; + home = "/var/lib/steam"; + createHome = true; + shell = pkgs.bash; + group = "steam"; + }; + groups.steam = {}; + }; + + systemd.tmpfiles.rules = [ + "d /var/lib/steam 0755 steam steam -" + "d /var/lib/steam/reforger/configs/ 0755 steam steam -" + "d /var/lib/steam/reforger/profile/ 0755 steam steam -" + "d /var/lib/steam/reforger/workshop/ 0755 steam steam -" ]; - services.arma.enable = true; - + deploy = { + enable = false; + }; networking = { hostName = "arma-reforger-tofu"; + firewall = { + enable = true; + allowedUDPPorts = [ 2001 17777 19999 ]; + }; }; - # environment.systemPackages = with pkgs; [ - # ]; + environment.systemPackages = [ + pkgs.steamcmd + pkgs.curl + ]; system.stateVersion = "25.05"; } diff --git a/modules/nixos/common/arma.nix b/modules/nixos/common/arma.nix deleted file mode 100644 index 01e67c4..0000000 --- a/modules/nixos/common/arma.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -let - cfg = config.services.arma; -in -{ - options.services.arma = { - enable = lib.mkEnableOption "enable arma"; - dataDir = lib.mkOption { - type = lib.types.str; - default = "/var/lib/steam"; - }; - }; - config = lib.mkIf cfg.enable { - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "steamcmd" - "steam-run" - "steam-unwrapped" - ]; - # Create steam user - users = { - users.steam = { - isSystemUser = true; - home = cfg.dataDir; - createHome = true; - shell = pkgs.bash; - group = "steam"; - }; - groups.steam = { }; - }; - systemd.tmpfiles.rules = [ - # "d /var/lib/steam 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 -" - ]; - systemd.services = { - arma = { - description = "arma game server"; - wantedBy = [ "multi-user.target" ]; - environment = { - ARMA_DIR = "${cfg.dataDir}"; - }; - path = with pkgs; [ - curl - steamcmd - steam-run - ]; - preStart = "${pkgs.arma-scripts}/scripts/update.sh"; - serviceConfig = { - User = "steam"; - WorkingDirectory = "${cfg.dataDir}/reforger"; - ExecStart = "${pkgs.arma-scripts}/scripts/start.sh"; - }; - }; - }; - }; -} diff --git a/modules/nixos/common/vmvariant.nix b/modules/nixos/common/vmvariant.nix deleted file mode 100644 index 5dc80ab..0000000 --- a/modules/nixos/common/vmvariant.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -{ - virtualisation.vmVariant = { - users.users.root.password = "pass"; - }; -} diff --git a/packages/arma-scripts/default.nix b/packages/arma-scripts/default.nix deleted file mode 100644 index 7589d24..0000000 --- a/packages/arma-scripts/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitea }: -fetchFromGitea { - domain = "git.skdevstudios.com"; - owner = "SK-Development-Studios"; - repo = "ground-zero-conflict-configuration"; - rev = "v0.0.1"; - sha256 = "sha256-0CclaDqtZxt385I6lgOydOJwdh4HbtNQyQOhwl7hNcM="; -}