From be30fdcd793717e687bb6290faa6cd60ebdaa4b1 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 6 Mar 2025 00:33:29 -0500 Subject: [PATCH] chore(jellyfin): update to latest nixos-jellyfin with overlay --- .../nos/modules/jellyfin/default.nix | 13 ++++-- .../nos/modules/jellyfin/packages.nix | 21 --------- flake.lock | 45 ++++++++++--------- flake.nix | 15 ++++--- inputs/default.nix | 2 +- modules/base/packages/default.nix | 1 + .../desktop/environment/modules/packages.nix | 10 ++--- 7 files changed, 47 insertions(+), 60 deletions(-) delete mode 100644 configurations/nos/modules/jellyfin/packages.nix diff --git a/configurations/nos/modules/jellyfin/default.nix b/configurations/nos/modules/jellyfin/default.nix index 8f42b5b4..7cf38cc3 100644 --- a/configurations/nos/modules/jellyfin/default.nix +++ b/configurations/nos/modules/jellyfin/default.nix @@ -1,8 +1,9 @@ { config, - jellyfin-flake, - mainUser, + nixos-jellyfin, lib, + mainUser, + pkgs, ... }: let inherit (lib) hasAttr optionals; @@ -14,8 +15,7 @@ in { imports = [ ./jfa-go.nix - ./packages.nix - jellyfin-flake.nixosModules.default + nixos-jellyfin.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"; diff --git a/configurations/nos/modules/jellyfin/packages.nix b/configurations/nos/modules/jellyfin/packages.nix deleted file mode 100644 index 5d9abb9b..00000000 --- a/configurations/nos/modules/jellyfin/packages.nix +++ /dev/null @@ -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; - }; -} diff --git a/flake.lock b/flake.lock index 1b586f35..980b75f1 100644 --- a/flake.lock +++ b/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", diff --git a/flake.nix b/flake.nix index a6081482..4f924887 100644 --- a/flake.nix +++ b/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"; diff --git a/inputs/default.nix b/inputs/default.nix index 8e2ad124..c13af46b 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -149,7 +149,7 @@ let repo = "nixos-docker-compose"; }; - jellyfin-flake = mkInput { + nixos-jellyfin = mkInput { owner = "matt1432"; repo = "nixos-jellyfin"; }; diff --git a/modules/base/packages/default.nix b/modules/base/packages/default.nix index 9dfaadc2..94b9501a 100644 --- a/modules/base/packages/default.nix +++ b/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" diff --git a/modules/desktop/environment/modules/packages.nix b/modules/desktop/environment/modules/packages.nix index 7f50ae15..16e8e1f9 100644 --- a/modules/desktop/environment/modules/packages.nix +++ b/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 = - jellyfin-flake - .packages - .${pkgs.system} - .jellyfin-media-player - .override {isNvidiaWayland = isNvidia;}; + # comes from nixos-jellyfin + jellyfinMediaPlayer = pkgs.jellyfin-media-player.override {isNvidiaWayland = isNvidia;}; GParted = let inherit