chore(jellyfin): update to latest nixos-jellyfin with overlay

configurations/nos/modules/jellyfin/default.nix

@@ -1,8 +1,9 @@
 {
   config,
-  jellyfin-flake,
+  nixos-jellyfin,
-  mainUser,
   lib,
+  mainUser,
+  pkgs,
   ...
 }: let
   inherit (lib) hasAttr optionals;
@@ -14,8 +15,7 @@
 in {
   imports = [
     ./jfa-go.nix
-    ./packages.nix
+    nixos-jellyfin.nixosModules.default
-    jellyfin-flake.nixosModules.default
   ];
 
   users.users."jellyfin".extraGroups =
@@ -28,6 +28,11 @@ in {
   services.jellyfin = {
     enable = true;
 
+    webPackage = pkgs.jellyfin-web.override {
+      forceEnableBackdrops = true;
+      forceDisablePreferFmp4 = true;
+    };
+
     settings = {
       system = {
         serverName = "Jelly";

configurations/nos/modules/jellyfin/packages.nix

@@ -1,21 +0,0 @@
-{
-  config,
-  jellyfin-flake,
-  pkgs,
-  ...
-}: let
-  jellyPkgs =
-    if config.nvidia.enableCUDA
-    # TODO: add overlays to upstream flake
-    then jellyfin-flake.packages.${pkgs.system}.cudaPackages
-    else jellyfin-flake.packages.${pkgs.system};
-in {
-  services.jellyfin = {
-    package = jellyPkgs.jellyfin;
-    webPackage = jellyPkgs.jellyfin-web.override {
-      forceEnableBackdrops = true;
-      forceDisablePreferFmp4 = true;
-    };
-    ffmpegPackage = jellyPkgs.jellyfin-ffmpeg;
-  };
-}

flake.lock

@@ -836,26 +836,6 @@
         "type": "github"
       }
     },
-    "jellyfin-flake": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1740340966,
-        "narHash": "sha256-h4+m+6IRwG1z5+jEUyC3MPzKhutOGhs6h5oNbYaul/c=",
-        "owner": "matt1432",
-        "repo": "nixos-jellyfin",
-        "rev": "a996604d38dad7ec280d6b2ad57542d05ca5714f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "matt1432",
-        "repo": "nixos-jellyfin",
-        "type": "github"
-      }
-    },
     "jovian": {
       "inputs": {
         "nix-github-actions": [
@@ -1323,6 +1303,29 @@
         "type": "github"
       }
     },
+    "nixos-jellyfin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741237837,
+        "narHash": "sha256-YbxjieouhSGNIAC4n/UyTKzQrNhLjRyU7BfVTQUMHZs=",
+        "owner": "matt1432",
+        "repo": "nixos-jellyfin",
+        "rev": "d4bd900cd1792f939b6a2650537ebee6e2130802",
+        "type": "github"
+      },
+      "original": {
+        "owner": "matt1432",
+        "repo": "nixos-jellyfin",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1741010256,
@@ -1645,7 +1648,6 @@
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "hyprpaper": "hyprpaper",
-        "jellyfin-flake": "jellyfin-flake",
         "jovian": "jovian",
         "kompass": "kompass",
         "lib-aggregate": "lib-aggregate",
@@ -1667,6 +1669,7 @@
         "nix-on-droid": "nix-on-droid",
         "nixcord": "nixcord",
         "nixd": "nixd",
+        "nixos-jellyfin": "nixos-jellyfin",
         "nixpkgs": "nixpkgs",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "nurl": "nurl",

flake.nix

@@ -178,12 +178,6 @@
       repo = "hyprpaper";
       type = "github";
     };
-    jellyfin-flake = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      owner = "matt1432";
-      repo = "nixos-jellyfin";
-      type = "github";
-    };
     jovian = {
       inputs = {
         nix-github-actions.follows = "nix-github-actions";
@@ -342,6 +336,15 @@
       repo = "nixd";
       type = "github";
     };
+    nixos-jellyfin = {
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
+      };
+      owner = "matt1432";
+      repo = "nixos-jellyfin";
+      type = "github";
+    };
     nixpkgs = {
       owner = "NixOS";
       ref = "nixos-unstable";

inputs/default.nix

@@ -149,7 +149,7 @@ let
       repo = "nixos-docker-compose";
     };
 
-    jellyfin-flake = mkInput {
+    nixos-jellyfin = mkInput {
       owner = "matt1432";
       repo = "nixos-jellyfin";
     };

modules/base/packages/default.nix

@@ -12,6 +12,7 @@ in {
     nixpkgs.overlays =
       (map (i: self.inputs.${i}.overlays.default) [
         "grim-hyprland"
+        "nixos-jellyfin"
         "nh"
         "nixd"
         "nurl"

modules/desktop/environment/modules/packages.nix

@@ -5,7 +5,7 @@ self: {
   ...
 }: let
   inherit (self.lib.hypr) mkBind;
-  inherit (self.inputs) jellyfin-flake nixcord;
+  inherit (self.inputs) nixcord;
 
   inherit (lib) attrValues getExe mkIf optionals;
   inherit (pkgs.writers) writeTOML;
@@ -203,12 +203,8 @@ in {
           satty
           ;
 
-        jellyfinMediaPlayer =
+        # comes from nixos-jellyfin
-          jellyfin-flake
+        jellyfinMediaPlayer = pkgs.jellyfin-media-player.override {isNvidiaWayland = isNvidia;};
-          .packages
-          .${pkgs.system}
-          .jellyfin-media-player
-          .override {isNvidiaWayland = isNvidia;};
 
         GParted = let
           inherit