reverted jellyfin to 10.9.6

This commit is contained in:
Danilo Reyes 2024-07-04 03:06:51 -06:00
parent 1565d2964f
commit 9d749ee082
3 changed files with 28 additions and 15 deletions

17
flake.lock generated
View File

@ -39,6 +39,22 @@
"type": "github" "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": { "master": {
"locked": { "locked": {
"lastModified": 1719853907, "lastModified": 1719853907,
@ -137,6 +153,7 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"jellyfin": "jellyfin",
"master": "master", "master": "master",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",

View File

@ -4,6 +4,8 @@
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05";
unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
master.url = "github:nixos/nixpkgs?ref=master"; master.url = "github:nixos/nixpkgs?ref=master";
jellyfin.url =
"github:nixos/nixpkgs?rev=c82ad1b10b310442e685bc150199747fdee92095";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -15,8 +17,8 @@
}; };
}; };
outputs = outputs = { self, nixpkgs, unstable, master, jellyfin, home-manager, sops-nix
{ self, nixpkgs, unstable, master, home-manager, sops-nix, ... }@inputs: , ... }@inputs:
let let
inherit (self) outputs; inherit (self) outputs;
lib = nixpkgs.lib // home-manager.lib; lib = nixpkgs.lib // home-manager.lib;
@ -29,6 +31,8 @@
pkgs = makePkgs nixpkgs; pkgs = makePkgs nixpkgs;
pkgsU = makePkgs unstable; pkgsU = makePkgs unstable;
pkgsM = makePkgs master; pkgsM = makePkgs master;
pkgsJ = makePkgs jellyfin;
overlays = [ (import ./overlay.nix { inherit pkgs pkgsU pkgsM pkgsJ; }) ];
in { in {
inherit lib pkgs; inherit lib pkgs;
formatter = pkgs.alejandra; formatter = pkgs.alejandra;
@ -39,10 +43,7 @@
modules = [ modules = [
./hosts/workstation/configuration.nix ./hosts/workstation/configuration.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
({ pkgs, ... }: { ({ pkgs, ... }: { nixpkgs.overlays = overlays; })
nixpkgs.overlays =
[ (import ./overlay.nix { inherit pkgs pkgsU pkgsM; }) ];
})
]; ];
}; };
miniserver = lib.nixosSystem { miniserver = lib.nixosSystem {
@ -51,10 +52,7 @@
modules = [ modules = [
./hosts/miniserver/configuration.nix ./hosts/miniserver/configuration.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
({ pkgs, ... }: { ({ pkgs, ... }: { nixpkgs.overlays = overlays; })
nixpkgs.overlays =
[ (import ./overlay.nix { inherit pkgs pkgsU pkgsM; }) ];
})
]; ];
}; };
server = lib.nixosSystem { server = lib.nixosSystem {
@ -63,10 +61,7 @@
modules = [ modules = [
./hosts/server/configuration.nix ./hosts/server/configuration.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
({ pkgs, ... }: { ({ pkgs, ... }: { nixpkgs.overlays = overlays; })
nixpkgs.overlays =
[ (import ./overlay.nix { inherit pkgs pkgsU pkgsM; }) ];
})
]; ];
}; };
}; };

View File

@ -1,4 +1,4 @@
{ pkgs, pkgsU, pkgsM }: { pkgs, pkgsU, pkgsM, pkgsJ }:
self: super: { self: super: {
gnome = super.gnome.overrideScope (gFinal: gPrev: { gnome = super.gnome.overrideScope (gFinal: gPrev: {
nautilus = gPrev.nautilus.overrideAttrs (nsuper: { nautilus = gPrev.nautilus.overrideAttrs (nsuper: {
@ -21,6 +21,7 @@ self: super: {
nerdfonts = super.nerdfonts.override { nerdfonts = super.nerdfonts.override {
fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ]; fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ];
}; };
jellyfin = pkgsJ.jellyfin;
planify = pkgsU.planify; planify = pkgsU.planify;
gdtoolkit = pkgsU.gdtoolkit; gdtoolkit = pkgsU.gdtoolkit;
gallery-dl = pkgsM.gallery-dl; gallery-dl = pkgsM.gallery-dl;