diff options
| author | Mel <einebeere@gmail.com> | 2024-11-29 23:28:42 +0100 |
|---|---|---|
| committer | Mel <einebeere@gmail.com> | 2024-11-29 23:30:18 +0100 |
| commit | cc65f6a38e7d4606b167587333088aef5ba8d49e (patch) | |
| tree | 162b5b45322565da4b66dddd45004a3a7f4cd149 | |
| parent | 8cbe7d9dc97940d27582bf1c977fb3d723a1e5cd (diff) | |
| download | minerals-cc65f6a38e7d4606b167587333088aef5ba8d49e.tar.zst minerals-cc65f6a38e7d4606b167587333088aef5ba8d49e.zip | |
Remove jellyfin from bismuth (now on corsac)
Signed-off-by: Mel <einebeere@gmail.com>
| -rw-r--r-- | machines/bismuth/default.nix | 1 | ||||
| -rw-r--r-- | machines/bismuth/devices.nix | 5 | ||||
| -rw-r--r-- | modules/jellyfin.nix | 15 | ||||
| -rw-r--r-- | pkgs/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/jellyfin-edited.nix | 15 |
5 files changed, 0 insertions, 41 deletions
diff --git a/machines/bismuth/default.nix b/machines/bismuth/default.nix index 2663703..f8d6b51 100644 --- a/machines/bismuth/default.nix +++ b/machines/bismuth/default.nix @@ -7,7 +7,6 @@ ./hardware.nix ./devices.nix - ../../modules/jellyfin.nix ../../modules/nvidia.nix ]; diff --git a/machines/bismuth/devices.nix b/machines/bismuth/devices.nix index 06fa69f..7105988 100644 --- a/machines/bismuth/devices.nix +++ b/machines/bismuth/devices.nix @@ -42,11 +42,6 @@ boot.supportedFilesystems = [ "ntfs" ]; fileSystems = { - "/run/media/mel/Duo" = { - device = "/dev/disk/by-label/Duo"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000" ]; - }; "/run/media/mel/Half" = { device = "/dev/disk/by-label/Half"; fsType = "ntfs-3g"; diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix deleted file mode 100644 index b285161..0000000 --- a/modules/jellyfin.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, pkgs, auxiliaryPkgs, ... }: - -{ - services.jellyfin = { - enable = true; - openFirewall = true; - package = auxiliaryPkgs.jellyfin; - }; - - environment.systemPackages = (with auxiliaryPkgs; [ - jellyfin - jellyfin-web - pkgs.jellyfin-ffmpeg - ]); -} diff --git a/pkgs/default.nix b/pkgs/default.nix index ec2599a..1f16455 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,11 +1,6 @@ { pkgs, unstablePkgs, ... }: rec { - inherit (pkgs.callPackages ./jellyfin-edited.nix { - jellyfin-prev = pkgs.jellyfin; - jellyfin-web-prev = pkgs.jellyfin-web; - }) jellyfin jellyfin-web; - inherit (pkgs.callPackages ./electron-wayland-wrappers.nix {}) discord obsidian diff --git a/pkgs/jellyfin-edited.nix b/pkgs/jellyfin-edited.nix deleted file mode 100644 index 5792c77..0000000 --- a/pkgs/jellyfin-edited.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ jellyfin-prev, jellyfin-web-prev }: - -let - script = "<script src=\"configurationpage?name=skip-intro-button.js\"></script>"; - - jellyfin-web = jellyfin-web-prev.overrideAttrs (attrs: { - postInstall = (attrs.postInstall or "") + '' - sed -i 's:</head>:${script}</head>:g' $out/share/jellyfin-web/index.html - ''; - }); - - jellyfin = jellyfin-prev.override { - inherit jellyfin-web; - }; -in { inherit jellyfin jellyfin-web; } |