mkModule various + fixes

modules/nixos/services/tdarr/default.nix

@@ -6,42 +6,50 @@
 }:
 with lib;
 let
-  cfg = config.${namespace}.services.tdarr;
-in
-{
-  imports = [ ./options.nix ];
+  inherit (lib.${namespace}) mkOpt;
+  name = "tdarr";
+  cfg = config.${namespace}.services.${name};
 
-  config = mkIf cfg.enable {
-
-    virtualisation.oci-containers.containers.${cfg.name} = {
-      autoStart = true;
-      image = cfg.image;
-      extraOptions = [ "--device=nvidia.com/gpu=0" ];
-      volumes = [
-        "${cfg.configPath}:/app/configs"
-        "${cfg.serverPath}:/app/server"
-        "${cfg.logPath}:/app/logs"
-        "${cfg.transcodePath}:/temp"
-        "${cfg.moviesPath}:/data/movies"
-        "${cfg.tvPath}:/data/tv"
-      ];
-      ports = [
-        "${cfg.serverPort}:8266"
-        "${cfg.webUIPort}:8265"
-      ];
-      environment = {
-        serverPort = "8266";
-        webUIPort = "8265";
-        internalNode = "true";
-        inContainer = "true";
-        ffmpegVersion = "6";
-        nodeName = "tdarr node";
-        NVIDIA_VISIBLE_DEVICES = "all";
-        NVIDIA_DRIVER_CAPABILITIES = "all";
-        PUID = cfg.puid;
-        PGID = cfg.pgid;
-        TZ = cfg.timeZone;
+  tdarrConfig = lib.${namespace}.mkModule {
+    inherit config name;
+    description = "tdarr";
+    options = {
+      serverPort = mkOpt types.str "8266" "node port";
+    };
+    moduleConfig = {
+      virtualisation.oci-containers.containers.${name} = {
+        autoStart = true;
+        image = "ghcr.io/haveagitgat/tdarr";
+        extraOptions = [ "--device=nvidia.com/gpu=0" ];
+        volumes = [
+          "${cfg.configDir}/tdarr/config:/app/configs"
+          "${cfg.configDir}/tdarr/server:/app/server"
+          "${cfg.configDir}/tdarr/logs:/app/logs"
+          "${cfg.configDir}/tdarr/transcode:/temp"
+          "${cfg.dataDir}/movies:/data/movies"
+          "${cfg.dataDir}/tv:/data/tv"
+        ];
+        ports = [
+          "${cfg.serverPort}:8266"
+          "${cfg.port}:8265"
+        ];
+        environment = {
+          serverPort = "8266";
+          webUIPort = "8265";
+          internalNode = "true";
+          inContainer = "true";
+          ffmpegVersion = "6";
+          nodeName = "tdarr node";
+          NVIDIA_VISIBLE_DEVICES = "all";
+          NVIDIA_DRIVER_CAPABILITIES = "all";
+          PUID = cfg.puid;
+          PGID = cfg.pgid;
+          TZ = cfg.timeZone;
+        };
       };
     };
   };
+in
+{
+  imports = [ tdarrConfig ];
 }