From 9a19aee4d26da4f13c82e56a5284ccfe2c86a68d Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Thu, 7 Mar 2024 00:05:18 -0500
Subject: [PATCH] chore: update jellyfin module

---
 devices/nos/modules/jellyfin/default.nix | 123 +++++++++++------------
 flake.lock                               |   6 +-
 2 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/devices/nos/modules/jellyfin/default.nix b/devices/nos/modules/jellyfin/default.nix
index 2bf35b52..d557a3ef 100644
--- a/devices/nos/modules/jellyfin/default.nix
+++ b/devices/nos/modules/jellyfin/default.nix
@@ -31,64 +31,74 @@ in {
       enable = true;
 
       settings = {
-        general = {
+        system = {
           serverName = "Jelly";
-
           quickConnectAvailable = false;
           isStartupWizardCompleted = true;
 
-          branding = let
-            jellyTheme = pkgs.stdenv.mkDerivation {
-              name = "Ultrachromic";
-              src = jellyfin-ultrachromic-src;
-              postInstall = "cp -ar $src $out";
-            };
-
-            importFile = file: fileContents "${jellyTheme}/${file}";
-          in {
-            customCss = ''
-              /* Base theme */
-              ${importFile "base.css"}
-              ${importFile "accentlist.css"}
-              ${importFile "fixes.css"}
-
-              ${importFile "type/dark_withaccent.css"}
-
-              ${importFile "rounding.css"}
-              ${importFile "progress/floating.css"}
-              ${importFile "titlepage/title_banner-logo.css"}
-              ${importFile "header/header_transparent.css"}
-              ${importFile "login/login_frame.css"}
-              ${importFile "fields/fields_border.css"}
-              ${importFile "cornerindicator/indicator_floating.css"}
-
-              /* Style backdrop */
-              .backdropImage {filter: blur(18px) saturate(120%) contrast(120%) brightness(40%);}
-
-              /* Custom Settings */
-              :root {--accent: 145,75,245;}
-              :root {--rounding: 12px;}
-
-              /* https://github.com/CTalvio/Ultrachromic/issues/79 */
-              .skinHeader {
-                color: rgba(var(--accent), 0.8);;
-              }
-              .countIndicator,
-              .fullSyncIndicator,
-              .mediaSourceIndicator,
-              .playedIndicator {
-                background-color: rgba(var(--accent), 0.8);
-              }
-            '';
-          };
-        };
-
-        libraries.display = {
           enableGroupingIntoCollections = true;
           enableExternalContentInSuggestions = false;
+
+          pluginRepositories = [
+            {
+              name = "Jellyfin Stable";
+              url = "https://repo.jellyfin.org/releases/plugin/manifest-stable.json";
+            }
+            {
+              name = "Intro Skipper";
+              url = "https://raw.githubusercontent.com/jumoog/intro-skipper/master/manifest.json";
+            }
+          ];
+
+          enableSlowResponseWarning = false;
         };
 
-        playback.transcoding = {
+        branding = let
+          jellyTheme = pkgs.stdenv.mkDerivation {
+            name = "Ultrachromic";
+            src = jellyfin-ultrachromic-src;
+            postInstall = "cp -ar $src $out";
+          };
+
+          importFile = file: fileContents "${jellyTheme}/${file}";
+        in {
+          customCss = ''
+            /* Base theme */
+            ${importFile "base.css"}
+            ${importFile "accentlist.css"}
+            ${importFile "fixes.css"}
+
+            ${importFile "type/dark_withaccent.css"}
+
+            ${importFile "rounding.css"}
+            ${importFile "progress/floating.css"}
+            ${importFile "titlepage/title_banner-logo.css"}
+            ${importFile "header/header_transparent.css"}
+            ${importFile "login/login_frame.css"}
+            ${importFile "fields/fields_border.css"}
+            ${importFile "cornerindicator/indicator_floating.css"}
+
+            /* Style backdrop */
+            .backdropImage {filter: blur(18px) saturate(120%) contrast(120%) brightness(40%);}
+
+            /* Custom Settings */
+            :root {--accent: 145,75,245;}
+            :root {--rounding: 12px;}
+
+            /* https://github.com/CTalvio/Ultrachromic/issues/79 */
+            .skinHeader {
+              color: rgba(var(--accent), 0.8);;
+            }
+            .countIndicator,
+            .fullSyncIndicator,
+            .mediaSourceIndicator,
+            .playedIndicator {
+              background-color: rgba(var(--accent), 0.8);
+            }
+          '';
+        };
+
+        encoding = {
           hardwareAccelerationType = "nvenc";
           hardwareDecodingCodecs = [
             "h264"
@@ -104,19 +114,6 @@ in {
           enableTonemapping = true;
           downMixAudioBoost = 1;
         };
-
-        plugins.pluginRepositories = [
-          {
-            name = "Jellyfin Stable";
-            url = "https://repo.jellyfin.org/releases/plugin/manifest-stable.json";
-          }
-          {
-            name = "Intro Skipper";
-            url = "https://raw.githubusercontent.com/jumoog/intro-skipper/master/manifest.json";
-          }
-        ];
-
-        advanced.logs.enableSlowResponseWarning = false;
       };
     };
 
diff --git a/flake.lock b/flake.lock
index aebc5f55..8a4d1113 100644
--- a/flake.lock
+++ b/flake.lock
@@ -657,11 +657,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709661015,
-        "narHash": "sha256-HXMinV0JohS1hg5FzYhcM9oyAbCqboJ5DJNqDqggOEE=",
+        "lastModified": 1709785905,
+        "narHash": "sha256-RUI/to18Mx76ocQmmKAlrbRSN+/sewNt+fdp9iDYWGM=",
         "owner": "matt1432",
         "repo": "nixos-jellyfin",
-        "rev": "9fe8adc89a0c95e233a62153f8b4c4f3982ba9fb",
+        "rev": "50274dcec43e2179d6cbf1e045eea5354e6af606",
         "type": "github"
       },
       "original": {