chore(minecraft): instanced server module

modules/nixos/minecraft/java.nix

@@ -1,20 +1,21 @@
-{
+let
+  javaServerModule = {
     config,
+    nixosConfig,
     gensokyo-zone,
     lib,
     pkgs,
     ...
   }: let
-  inherit (gensokyo-zone.lib) mapOptionDefaults;
+    inherit (gensokyo-zone.lib) mapOptionDefaults unmerged;
     inherit (lib.options) mkOption mkEnableOption mkPackageOption;
-  inherit (lib.modules) mkIf mkMerge mkAfter mkOptionDefault;
+    inherit (lib.modules) mkIf mkAfter mkOptionDefault;
     inherit (lib.strings) escapeShellArgs;
     inherit (lib.meta) getExe;
-  inherit (config.lib.minecraft) mkAllowPlayerType writeWhiteList writeOps;
-  cfg = config.services.minecraft-java-server;
+    inherit (nixosConfig.lib.minecraft) mkAllowPlayerType writeWhiteList writeOps;
     defaultPort = 25565;
   in {
-  options.services.minecraft-java-server = with lib.types; {
+    options = with lib.types; {
       enable = mkEnableOption "minecraft java edition server";
 
       openFirewall = mkOption {
@@ -53,7 +54,7 @@ in {
       };
       group = mkOption {
         type = str;
-      default = cfg.user;
+        default = config.user;
       };
 
       serverProperties = mkOption {
@@ -64,11 +65,26 @@ in {
         type = nullOr (attrsOf (mkAllowPlayerType {}));
         default = null;
       };
+
+      conf = {
+        systemdService = mkOption {
+          type = unmerged.types.attrs;
+        };
+        systemdSocket = mkOption {
+          type = unmerged.types.attrs;
+        };
+        users = mkOption {
+          type = unmerged.types.attrs;
+          default = {};
+        };
+        networkingFirewall = mkOption {
+          type = unmerged.types.attrs;
+          default = {};
+        };
+      };
     };
 
-  config = let
-    confService.services.minecraft-java-server = {
-      # TODO: fill with defaults
+    config = {
       serverProperties = mapOptionDefaults {
         enable-jmx-monitoring = false;
         "rcon.port" = 25575;
@@ -81,7 +97,7 @@ in {
         level-name = "world";
         motd = "A Minecraft Server";
         #"query.port" = defaultPort;
-        "query.port" = cfg.serverProperties.server-port or defaultPort;
+        "query.port" = config.serverProperties.server-port or defaultPort;
         pvp = true;
         generate-structures = true;
         max-chained-neighbor-updates = 1000000;
@@ -129,24 +145,24 @@ in {
         resource-pack-sha1 = "";
         max-world-size = 29999984;
       };
-    };
-    conf.users = mkIf (cfg.user == "minecraft-bedrock") {
-      users.${cfg.user} = {
-        inherit (cfg) group;
+
+      conf.users = mkIf (config.user == "minecraft-bedrock") {
+        users.${config.user} = {
+          inherit (config) group;
           description = "Minecraft server service user";
-        home = cfg.dataDir;
+          home = config.dataDir;
           createHome = true;
           isSystemUser = true;
         };
-      groups.${cfg.group} = {};
+        groups.${config.group} = {};
       };
 
-    conf.systemd.services.minecraft-java-server = let
+      conf.systemdService = let
         execStartArgs =
-        map (argsFile: "@${argsFile}") cfg.argsFiles
-        ++ cfg.jvmOpts;
+          map (argsFile: "@${argsFile}") config.argsFiles
+          ++ config.jvmOpts;
         execStop = pkgs.writeShellScriptBin "minecraft-java-stop" ''
-        echo /stop > ${config.systemd.sockets.minecraft-java-server.socketConfig.ListenFIFO} || true
+          echo /stop > ${nixosConfig.systemd.sockets.minecraft-java-server.socketConfig.ListenFIFO} || true
 
           if [[ -n ''${MAINPID-} ]]; then
             # Wait for the PID of the minecraft server to disappear before
@@ -164,26 +180,26 @@ in {
 
         restartIfChanged = false;
         restartTriggers = [
-        cfg.dataDir
-        cfg.jvmOpts
-        cfg.argsFiles
+          config.dataDir
+          config.jvmOpts
+          config.argsFiles
         ];
 
-      path = [cfg.jre.package];
+        path = [config.jre.package];
         script = mkAfter ''
           exec java ${escapeShellArgs execStartArgs}
         '';
 
         serviceConfig = {
-        BindReadOnlyPaths = mkIf (cfg.allowPlayers != null) [
-          "${writeWhiteList cfg.allowPlayers}:${cfg.dataDir}/whitelist.json"
-          "${writeOps cfg.allowPlayers}:${cfg.dataDir}/ops.json"
+          BindReadOnlyPaths = mkIf (config.allowPlayers != null) [
+            "${writeWhiteList config.allowPlayers}:${config.dataDir}/whitelist.json"
+            "${writeOps config.allowPlayers}:${config.dataDir}/ops.json"
           ];
           ExecStop = getExe execStop;
           Restart = "always";
           RestartSec = 3;
-        User = cfg.user;
-        WorkingDirectory = cfg.dataDir;
+          User = config.user;
+          WorkingDirectory = config.dataDir;
           RuntimeDirectory = "minecraft-java";
 
           StandardInput = "socket";
@@ -213,24 +229,57 @@ in {
           UMask = "0077";
         };
       };
-    conf.systemd.sockets.minecraft-java-server = {
+      conf.systemdSocket = {
         partOf = ["minecraft-java-server.service"];
         socketConfig = {
           ListenFIFO = "/run/minecraft-java/stdin";
           SocketMode = "0660";
-        SocketUser = mkOptionDefault cfg.user;
-        SocketGroup = mkOptionDefault cfg.group;
+          SocketUser = mkOptionDefault config.user;
+          SocketGroup = mkOptionDefault config.group;
           RemoveOnStop = true;
           FlushPending = true;
         };
       };
 
-    conf.networking.firewall = mkIf cfg.openFirewall {
-      allowedUDPPorts = cfg.port;
+      conf.networkingFirewall = mkIf config.openFirewall {
+        allowedUDPPorts = config.port;
       };
-  in
-    mkMerge [
-      confService
-      (mkIf cfg.enable conf)
+    };
+  };
+in {
+  pkgs,
+  config,
+  gensokyo-zone,
+  lib,
+  ...
+}: let
+  inherit (gensokyo-zone.lib) unmerged;
+  inherit (lib.options) mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  cfg = config.services.minecraft-java-server;
+in {
+  # TODO: attrsOf submodule
+  options.services.minecraft-java-server = with lib.types; mkOption {
+    type = submoduleWith {
+      modules = [javaServerModule];
+      specialArgs = {
+        inherit gensokyo-zone pkgs;
+        nixosConfig = config;
+      };
+    };
+    default = {};
+  };
+
+  config = let
+    serviceConf.users = unmerged.mergeAttrs cfg.conf.users;
+    serviceConf.systemd.services.minecraft-java-server = unmerged.mergeAttrs cfg.conf.systemdService;
+    serviceConf.systemd.sockets.minecraft-java-server = unmerged.mergeAttrs cfg.conf.systemdSocket;
+    serviceConf.networking.firewall = unmerged.mergeAttrs cfg.conf.networkingFirewall;
+    conf.lib.minecraft = {
+      inherit javaServerModule;
+    };
+  in mkMerge [
+    (mkIf cfg.enable serviceConf)
+    conf
   ];
 }