diff --git a/machines/urithiru/default.nix b/machines/urithiru/default.nix index bd9365eb..af01a712 100644 --- a/machines/urithiru/default.nix +++ b/machines/urithiru/default.nix @@ -44,10 +44,6 @@ rootDataset = "zroot/local/root"; }; }; - games = { - teeworlds.server = false; - zeroad.server = true; - }; services = { accentor.enable = true; containers.externalInterface = "eno3"; diff --git a/modules/games/default.nix b/modules/games/default.nix index 30efdcce..81a21aca 100644 --- a/modules/games/default.nix +++ b/modules/games/default.nix @@ -6,9 +6,7 @@ ./mumble ./particles ./steam - ./teeworlds ./tetris - ./zeroad ]; options.chvp.games.enable = lib.mkOption { @@ -21,7 +19,6 @@ minecraft.client = lib.mkDefault false; mumble.enable = lib.mkDefault true; steam.enable = lib.mkDefault true; - zeroad.client = lib.mkDefault true; }; }; } diff --git a/modules/games/teeworlds/default.nix b/modules/games/teeworlds/default.nix deleted file mode 100644 index 4796a166..00000000 --- a/modules/games/teeworlds/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, ... }: - -{ - options = { - chvp.games.teeworlds.server = lib.mkOption { - default = false; - example = true; - }; - }; - - config = lib.mkIf config.chvp.games.teeworlds.server { - services.teeworlds = { - enable = true; - openPorts = true; - extraOptions = [ - "sv_gametype ctf" - "sv_maprotation ctf1 ctf2 ctf3 ctf4 ctf5 ctf6 ctf7 ctf8" - "sv_map ctf1" - "sv_scorelimit 250" - "sv_teamdamage 1" - ]; - }; - }; -} diff --git a/modules/games/zeroad/default.nix b/modules/games/zeroad/default.nix deleted file mode 100644 index add550fa..00000000 --- a/modules/games/zeroad/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options = { - chvp.games.zeroad = { - client = lib.mkOption { - default = false; - example = true; - }; - server = lib.mkOption { - default = false; - example = true; - }; - }; - }; - - config = lib.mkIf (config.chvp.games.zeroad.server || config.chvp.games.zeroad.client) { - chvp.base.zfs.homeLinks = [ - { path = ".config/0ad"; type = "cache"; } - ]; - - # Needs to be here, since a headless server probably doesn't have this enabled yet. - hardware.graphics.enable = true; - home-manager.users.charlotte = { pkgs, ... }: { - home.packages = [ pkgs.zeroad ]; - }; - - networking.firewall = lib.mkIf config.chvp.games.zeroad.server { - allowedTCPPorts = [ 20595 ]; - allowedUDPPorts = [ 20595 ]; - }; - services.xrdp = lib.mkIf config.chvp.games.zeroad.server { - enable = true; - defaultWindowManager = "${pkgs.icewm}/bin/icewm"; - }; - }; -}