cleanup minecraft test

flake.nix

@@ -223,6 +223,11 @@
               nix-minecraft.overlay
               (import ./modules/overlays.nix)
             ];
+            nixpkgs.config.allowUnfreePredicate =
+              pkg:
+              builtins.elem (nixpkgs.lib.getName pkg) [
+                "minecraft-server"
+              ];
           }
 
           lanzaboote.nixosModules.lanzaboote

services/minecraft.nix

@@ -17,19 +17,6 @@
     inputs.nix-minecraft.nixosModules.minecraft-servers
   ];
 
-  environment.systemPackages = [
-    (pkgs.writeScriptBin "mc-console" ''
-      #!/bin/sh
-      ${pkgs.tmux}/bin/tmux -S /run/minecraft/${service_configs.minecraft.server_name}.sock attach
-    '')
-  ];
-
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "minecraft-server"
-    ];
-
   services.minecraft-servers = {
     enable = true;
     eula = true;

tests/minecraft.nix

@@ -6,25 +6,7 @@
   ...
 }:
 let
-  # Create pkgs with nix-minecraft overlay and unfree packages allowed
-  testPkgs = import inputs.nixpkgs {
-    system = pkgs.stdenv.targetPlatform.system;
-    config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "minecraft-server" ];
-    overlays = [
-      inputs.nix-minecraft.overlay
-      (import ../modules/overlays.nix)
-    ];
-  };
-
-  # Create a wrapper module that imports the actual minecraft service
-  minecraftService =
-    { config, ... }:
-    {
-      imports = [
-        (import ../services/minecraft.nix {
-          inherit lib config inputs;
-          pkgs = testPkgs;
-          service_configs = {
+  testServiceConfigs = {
     minecraft = {
       server_name = "main";
       parent_dir = "/var/lib/minecraft";
@@ -34,23 +16,31 @@ let
     };
     zpool_ssds = "";
   };
-          username = "testuser";
-        })
+
+  # Create pkgs with nix-minecraft overlay and unfree packages allowed
+  testPkgs = import inputs.nixpkgs {
+    system = pkgs.stdenv.targetPlatform.system;
+    config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "minecraft-server" ];
+    overlays = [
+      inputs.nix-minecraft.overlay
+      (import ../modules/overlays.nix)
     ];
-      # Override nixpkgs config to prevent conflicts in test environment
-      nixpkgs.config = lib.mkForce {
-        allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "minecraft-server" ];
-      };
   };
 in
 testPkgs.testers.runNixOSTest {
   name = "minecraft server startup test";
 
+  node.specialArgs = {
+    inherit inputs lib;
+    service_configs = testServiceConfigs;
+    username = "testuser";
+  };
+
   nodes.machine =
-    { ... }:
+    { lib, ... }:
     {
       imports = [
-        minecraftService
+        ../services/minecraft.nix
       ];
 
       # Enable caddy service (required by minecraft service)