From edaab48520f4f4ce8678442330a312ea62d39652 Mon Sep 17 00:00:00 2001 From: Lucy Date: Fri, 19 Sep 2025 17:37:11 +0200 Subject: [PATCH] Meow --- hosts/server/configuration.nix | 41 +++++++++++++++++++++++---------- nixos-modules/openarena.nix | 42 ---------------------------------- 2 files changed, 29 insertions(+), 54 deletions(-) delete mode 100644 nixos-modules/openarena.nix diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 86ddfa7..badcb85 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -82,19 +82,36 @@ in # services.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.lucy = { - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCKx5uQMiE19+jDmEueahQDXMGVzlC678ZwaztrwIlR lucy@twinkpad + users.users = { + lucy = { + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCKx5uQMiE19+jDmEueahQDXMGVzlC678ZwaztrwIlR lucy@twinkpad " - ]; - isNormalUser = true; - extraGroups = [ - "wheel" - "podman" - ]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ - tree - ]; + ]; + isNormalUser = true; + extraGroups = [ + "wheel" + "podman" + ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + tree + ]; + }; + johannes = { + + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMdk2Sr2drl2NcwlZlOAhFppER9sqvYmPdvAviWVVakT johannes-mba" + ]; + isNormalUser = true; + extraGroups = [ + "wheel" + "podman" + ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + tree + ]; + }; + }; # programs.firefox.enable = true; diff --git a/nixos-modules/openarena.nix b/nixos-modules/openarena.nix deleted file mode 100644 index 1d29e0e..0000000 --- a/nixos-modules/openarena.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, ...}: -let - {inherit lib;} mkEnableOption mkOption; -in { - options = { - services.openarena = { - enable = mkEnableOption "OpenArena game servers"; - - instances = mkOption { - type = types.listOf (types.submodule { - options = { - name = mkOption { - type = types.str; - description = "Unique name for this server instance"; - }; - port = mkOption { - type = types.int; - default = 27960; - description = "UDP port for the server"; - }; - gameMode = mkOption { - type = types.str; - default = "oa_dm1"; - description = "Default map or game mode to start"; - }; - extraFlags = mkOption { - type = types.listOf types.str; - default = [ ]; - description = "Extra flags to pass to oa_ded"; - }; - openPorts = mkOption { - type = types.bool; - default = false; - description = "Whether to open firewall ports for this instance"; - }; - }; - })); - }; - }; -}; - -}