mkModule various

modules/nixos/services/jellyfin/default.nix

@@ -6,19 +6,25 @@
 }:
 with lib;
 let
-  cfg = config.${namespace}.services.jellyfin;
-in
-{
-  imports = [ ./options.nix ];
+  name = "jellyfin";
+  cfg = config.${namespace}.services.${name};
 
-  config = mkIf cfg.enable {
-    services.jellyfin = {
-      enable = true;
-      openFirewall = true;
-      user = "nix-apps";
-      group = "jallen-nas";
-      dataDir = "/media/nas/main/nix-app-data/jellyfin";
-      # cacheDir = "/cache";
+  jellyfinConfig = lib.${namespace}.mkModule {
+    inherit config name;
+    description = "jellyfin";
+    options = { };
+    moduleConfig = {
+      services.jellyfin = {
+        enable = true;
+        openFirewall = cfg.openFirewall;
+        user = "nix-apps";
+        group = "jallen-nas";
+        dataDir = "${cfg.configDir}/jellyfin";
+        # cacheDir = "/cache";
+      };
     };
   };
+in
+{
+  imports = [ jellyfinConfig ];
 }

modules/nixos/services/jellyfin/options.nix

@@ -1,7 +0,0 @@
-{ lib, namespace, ... }:
-with lib;
-{
-  options.${namespace}.services.jellyfin = {
-    enable = mkEnableOption "enable jellyfin";
-  };
-}