mkModule various

modules/nixos/services/netbootxyz/default.nix

@@ -6,40 +6,49 @@
 }:
 with lib;
 let
-  cfg = config.${namespace}.services.netbootxyz;
-in
-{
-  imports = [ ./options.nix ];
+  inherit (lib.${namespace}) mkOpt;
+  name = "netbootxyz";
+  cfg = config.${namespace}.services.${name};
 
-  config = mkIf cfg.enable {
-    # Open firewall for netbootxyz if enabled
-    networking.firewall = mkIf cfg.openFirewall {
-      allowedTCPPorts = [
-        cfg.webPort
-        cfg.assetPort
-        cfg.tftpPort
-      ];
-      allowedUDPPorts = [
-        cfg.webPort
-        cfg.assetPort
-        cfg.tftpPort
-      ];
+  netbootxyzConfig = lib.${namespace}.mkModule {
+    inherit config name;
+    description = "netbootxyz";
+    options = {
+      assetPort = mkOpt types.port 4001 "NGINX server for hosting assets.";
+
+      tftpPort = mkOpt types.port 69 "HTTPS port for netbootxyz";
     };
+    moduleConfig = {
+      # Open firewall for netbootxyz if enabled
+      networking.firewall = mkIf cfg.openFirewall {
+        allowedTCPPorts = [
+          cfg.assetPort
+          cfg.tftpPort
+        ];
+        allowedUDPPorts = [
+          cfg.assetPort
+          cfg.tftpPort
+        ];
+      };
 
-    virtualisation.oci-containers = {
-      containers.netbootxyz = {
-        autoStart = true;
-        image = "ghcr.io/netbootxyz/netbootxyz:latest";
-        ports = [
-          "${toString cfg.webPort}:3000"
-          "${toString cfg.assetPort}:80"
-          "${toString cfg.tftpPort}:69"
-        ];
-        volumes = [
-          "${cfg.dataDir}:/config"
-          "${cfg.assetDir}:/assets"
-        ];
+      virtualisation.oci-containers = {
+        containers.netbootxyz = {
+          autoStart = true;
+          image = "ghcr.io/netbootxyz/netbootxyz:latest";
+          ports = [
+            "${toString cfg.port}:3000"
+            "${toString cfg.assetPort}:80"
+            "${toString cfg.tftpPort}:69"
+          ];
+          volumes = [
+            "${cfg.configDir}/netbootxyz:/config"
+            "${cfg.dataDir}/isos:/assets"
+          ];
+        };
       };
     };
   };
+in
+{
+  imports = [ netbootxyzConfig ];
 }

modules/nixos/services/netbootxyz/options.nix

@@ -1,43 +0,0 @@
-{ lib, namespace, ... }:
-with lib;
-{
-  options.${namespace}.services.netbootxyz = {
-    enable = mkEnableOption "netbootxyz network boot service";
-
-    webPort = mkOption {
-      type = types.port;
-      default = 4000;
-      description = "HTTP port for netbootxyz";
-    };
-
-    assetPort = mkOption {
-      type = types.port;
-      default = 4001;
-      description = "NGINX server for hosting assets.";
-    };
-
-    tftpPort = mkOption {
-      type = types.port;
-      default = 69;
-      description = "HTTPS port for netbootxyz";
-    };
-
-    openFirewall = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Whether to open firewall for netbootxyz";
-    };
-
-    dataDir = mkOption {
-      type = types.str;
-      default = "/media/nas/main/nix-app-data/netbootxyz";
-      description = "Data directory for netbootxyz";
-    };
-
-    assetDir = mkOption {
-      type = types.str;
-      default = "/media/nas/main/isos";
-      description = "Asset directory for netbootxyz";
-    };
-  };
-}