modules/config.nix

@@ -68,11 +68,11 @@ in {
                       file = "network.xml";
                       content = cfg.network;
                     }
-                    {
+                    # {
-                      name = "EncodingOptions";
+                    #   name = "EncodingOptions";
-                      file = "encoding.xml";
+                    #   file = "encoding.xml";
-                      content = cfg.encoding;
+                    #   content = cfg.encoding;
-                    }
+                    # }
                     {
                       name = "ServerConfiguration";
                       file = "system.xml";
@@ -96,8 +96,7 @@ in {
             # VALUES(${user.})"
             genUser = index: user: let
               values =
-                builtins.mapAttrs
+                builtins.mapAttrs (name: value:
-                (name: value:
                   if (isBool value)
                   then
                     if value
@@ -127,11 +126,9 @@ in {
                 if [ -n $(${sq} "SELECT 1 FROM Users WHERE Username = '${user.Username}'") ]; then
                   # Create user
                     ${sq} "INSERT INTO Users (${concatStringsSep ","
-                  (
+                  (builtins.filter (x: x != "HashedPasswordFile")
-                    builtins.filter (x: x != "HashedPasswordFile")
                     (lib.attrsets.mapAttrsToList (name: value: "${name}")
-                      options.services.declarative-jellyfin.Users.options)
+                      options.services.declarative-jellyfin.Users.options))}) \\
-                  )}) \\
                     VALUES(${builtins.attrValues values})"
                 fi
               '';
@@ -142,14 +139,11 @@ in {
             ''
               mkdir -p ${path}
               # Make sure there is a database
-              if [ -z "${path}/${dbname}" ]; then
+              if [ -z "${path}/${dbname}" ] && cp ${defaultDB} "${path}/${dbname}"
-                cp ${defaultDB} "${path}/${dbname}"
-              fi
 
               maxIndex=$(${sq} 'SELECT InternalId FROM Users ORDER BY InternalId DESC LIMIT 1')
-              if [ -n "$maxIndex" ]; then
+              if [ -n "$maxIndex" ] && maxIndex="1"
-                maxIndex="1"
+
-              fi
 
             ''
         );

modules/options/encoding.nix

@@ -1,10 +1,6 @@
-{
+{lib, ...}:
-  pkgs,
-  lib,
-  ...
-}:
 with lib; {
-  options.services.declarative-jellyfin.encoding = {
+  options.service.declarative-jellyfin.encoding = {
     EncodingThreadCount = mkOption {
       type = types.int;
       default = -1;
@@ -22,7 +18,7 @@ with lib; {
     EnableFallbackFont = mkEnableOption "Enable fallback font";
     EnableAudioVbr = mkEnableOption "Enable VBR Audio";
     DownMixAudioBoost = mkOption {
-      type = types.number;
+      type = types.float;
       default = 2;
       description = "Boost audio when downmixing. A value of one will preserve the original volume.";
     };
@@ -130,7 +126,7 @@ with lib; {
       default = "auto";
     };
     TonemappingDesat = mkOption {
-      type = types.number;
+      type = types.float;
       description = ''
         Apply desaturation for highlights that exceed this level of brightness.
         The higher the parameter, the more color information will be preserved.
@@ -142,7 +138,7 @@ with lib; {
       default = 0;
     };
     TonemappingPeak = mkOption {
-      type = types.number;
+      type = types.float;
       description = ''
         Override signal/nominal/reference peak with this value.
         Useful when the embedded peak information in display metadata is not reliable or when tone mapping from a lower range to a higher range.
@@ -152,7 +148,7 @@ with lib; {
       default = 100;
     };
     TonemapingParam = mkOption {
-      type = types.number;
+      type = types.float;
       description = ''
         Tune the tone mapping algorithm.
         The recommended and default values are 0.
@@ -162,7 +158,7 @@ with lib; {
       default = 0;
     };
     VppTonemappingBrightness = mkOption {
-      type = types.number;
+      type = types.float;
       description = ''
         Apply brightness gain in VPP tone mapping.
 
@@ -171,7 +167,7 @@ with lib; {
       default = 16;
     };
     VppTonemappingContrast = mkOption {
-      type = types.number;
+      type = types.float;
       description = ''
         Apply contrast gain in VPP tone mapping.
 
@@ -282,7 +278,7 @@ with lib; {
       '';
     };
     AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = mkOption {
-      type = with types; listOf str;
+      type = types.listOf str;
       description = "imma be real i have no idea what this option is. Just leave it as the default";
       default = ["mkv"];
     };