mkModule various

modules/nixos/services/manyfold/default.nix

@@ -6,34 +6,40 @@
 }:
 with lib;
 let
-  cfg = config.${namespace}.services.manyfold;
-in
-{
-  imports = [ ./options.nix ];
+  name = "manyfold";
+  cfg = config.${namespace}.services.${name};
 
-  config = mkIf cfg.enable {
-    virtualisation.oci-containers.containers."${cfg.name}" = {
-      autoStart = cfg.autoStart;
-      image = cfg.image;
-      ports = [ "${cfg.httpPort}:3214" ];
-      extraOptions = [
-        "--cap-drop=ALL"
-        "--cap-add=CHOWN"
-        "--cap-add=DAC_OVERRIDE"
-        "--cap-add=SETUID"
-        "--cap-add=SETGID"
-        "--security-opt=no-new-privileges:true"
-      ];
-      volumes = [
-        "${cfg.configPath}:/config"
-        "${cfg.dataPath}:/libraries"
-      ];
-      environment = {
-        PUID = cfg.puid;
-        PGID = cfg.pgid;
-        TZ = cfg.timeZone;
+  manyfoldConfig = lib.${namespace}.mkModule {
+    inherit config name;
+    description = "manyfold";
+    options = { };
+    moduleConfig = {
+      virtualisation.oci-containers.containers."${name}" = {
+        autoStart = true;
+        image = "ghcr.io/manyfold3d/manyfold-solo";
+        ports = [ "${toString cfg.port}:3214" ];
+        extraOptions = [
+          "--cap-drop=ALL"
+          "--cap-add=CHOWN"
+          "--cap-add=DAC_OVERRIDE"
+          "--cap-add=SETUID"
+          "--cap-add=SETGID"
+          "--security-opt=no-new-privileges:true"
+        ];
+        volumes = [
+          "${cfg.configDir}/manyfold:/config"
+          "${cfg.dataDir}/3d_printer:/libraries"
+        ];
+        environment = {
+          PUID = cfg.puid;
+          PGID = cfg.pgid;
+          TZ = cfg.timeZone;
+        };
+        environmentFiles = [ config.sops.secrets."jallen-nas/manyfold/secretkeybase".path ];
       };
-      environmentFiles = [ config.sops.secrets."jallen-nas/manyfold/secretkeybase".path ];
     };
   };
+in
+{
+  imports = [ manyfoldConfig ];
 }

modules/nixos/services/manyfold/options.nix

@@ -1,52 +0,0 @@
-{ lib, namespace, ... }:
-with lib;
-{
-  options.${namespace}.services.manyfold = {
-    enable = mkEnableOption "manyfold docker service";
-
-    autoStart = mkOption {
-      type = types.bool;
-      default = true;
-    };
-
-    httpPort = mkOption {
-      type = types.str;
-      default = "3214";
-    };
-
-    name = mkOption {
-      type = types.str;
-      default = "manyfold";
-    };
-
-    image = mkOption {
-      type = types.str;
-      default = "ghcr.io/manyfold3d/manyfold-solo";
-    };
-
-    configPath = mkOption {
-      type = types.str;
-      default = "/media/nas/main/nix-app-data/manyfold";
-    };
-
-    dataPath = mkOption {
-      type = types.str;
-      default = "/media/nas/main/3d_printer";
-    };
-
-    puid = mkOption {
-      type = types.str;
-      default = "911";
-    };
-
-    pgid = mkOption {
-      type = types.str;
-      default = "1000";
-    };
-
-    timeZone = mkOption {
-      type = types.str;
-      default = "America/Chicago";
-    };
-  };
-}