diff --git a/flake.lock b/flake.lock
index 9e3b097..3d4a661 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,6 +39,22 @@
         "type": "github"
       }
     },
+    "jellyfin": {
+      "locked": {
+        "lastModified": 1719516056,
+        "narHash": "sha256-fk+tniEoJmXVfLQjhKWjAl/Z+cExI00h66PrmQHujI0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c82ad1b10b310442e685bc150199747fdee92095",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c82ad1b10b310442e685bc150199747fdee92095",
+        "type": "github"
+      }
+    },
     "master": {
       "locked": {
         "lastModified": 1719853907,
@@ -137,6 +153,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "jellyfin": "jellyfin",
         "master": "master",
         "nix-gaming": "nix-gaming",
         "nixpkgs": "nixpkgs_2",
diff --git a/flake.nix b/flake.nix
index 779e665..95095e1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,8 @@
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05";
     unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     master.url = "github:nixos/nixpkgs?ref=master";
+    jellyfin.url =
+      "github:nixos/nixpkgs?rev=c82ad1b10b310442e685bc150199747fdee92095";
     home-manager = {
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -15,8 +17,8 @@
     };
   };
 
-  outputs =
-    { self, nixpkgs, unstable, master, home-manager, sops-nix, ... }@inputs:
+  outputs = { self, nixpkgs, unstable, master, jellyfin, home-manager, sops-nix
+    , ... }@inputs:
     let
       inherit (self) outputs;
       lib = nixpkgs.lib // home-manager.lib;
@@ -29,6 +31,8 @@
       pkgs = makePkgs nixpkgs;
       pkgsU = makePkgs unstable;
       pkgsM = makePkgs master;
+      pkgsJ = makePkgs jellyfin;
+      overlays = [ (import ./overlay.nix { inherit pkgs pkgsU pkgsM pkgsJ; }) ];
     in {
       inherit lib pkgs;
       formatter = pkgs.alejandra;
@@ -39,10 +43,7 @@
           modules = [
             ./hosts/workstation/configuration.nix
             sops-nix.nixosModules.sops
-            ({ pkgs, ... }: {
-              nixpkgs.overlays =
-                [ (import ./overlay.nix { inherit pkgs pkgsU pkgsM; }) ];
-            })
+            ({ pkgs, ... }: { nixpkgs.overlays = overlays; })
           ];
         };
         miniserver = lib.nixosSystem {
@@ -51,10 +52,7 @@
           modules = [
             ./hosts/miniserver/configuration.nix
             sops-nix.nixosModules.sops
-            ({ pkgs, ... }: {
-              nixpkgs.overlays =
-                [ (import ./overlay.nix { inherit pkgs pkgsU pkgsM; }) ];
-            })
+            ({ pkgs, ... }: { nixpkgs.overlays = overlays; })
           ];
         };
         server = lib.nixosSystem {
@@ -63,10 +61,7 @@
           modules = [
             ./hosts/server/configuration.nix
             sops-nix.nixosModules.sops
-            ({ pkgs, ... }: {
-              nixpkgs.overlays =
-                [ (import ./overlay.nix { inherit pkgs pkgsU pkgsM; }) ];
-            })
+            ({ pkgs, ... }: { nixpkgs.overlays = overlays; })
           ];
         };
       };
diff --git a/overlay.nix b/overlay.nix
index cac5fee..88dd2fc 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgsU, pkgsM }:
+{ pkgs, pkgsU, pkgsM, pkgsJ }:
 self: super: {
   gnome = super.gnome.overrideScope (gFinal: gPrev: {
     nautilus = gPrev.nautilus.overrideAttrs (nsuper: {
@@ -21,6 +21,7 @@ self: super: {
   nerdfonts = super.nerdfonts.override {
     fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ];
   };
+  jellyfin = pkgsJ.jellyfin;
   planify = pkgsU.planify;
   gdtoolkit = pkgsU.gdtoolkit;
   gallery-dl = pkgsM.gallery-dl;