diff --git a/README.md b/README.md index fdc7f2d..57db56d 100644 --- a/README.md +++ b/README.md @@ -257,10 +257,10 @@ without it. | `steamFrame.clipboardSync.package` | package | built from `dnut/clipboard-sync` | The clipboard-sync package. | | `steamFrame.firefox.enable` | bool | `false` | Launcher for the Flathub Firefox Flatpak with the fixes below. | | `steamFrame.firefox.vrFullscreenFix` | bool | `true` | Default `full-screen-api.ignore-widgets` to `true` (not in the desktop profile). | -| `steamFrame.firefox.disableAv1` | bool | `true` | Default `media.av1.enabled` to `false`: the Frame's decoder driver has no AV1, so sites send VP9/H.264, decoded in hardware. | +| `steamFrame.firefox.disableAv1` | bool | `false` | Default `media.av1.enabled` to `false`: the Frame's decoder driver has no AV1, so sites send VP9/H.264, decoded in hardware. | | `steamFrame.firefox.prefs` | attrs of bool, int or str | `{ }` | Further `about:config` default values for every profile (override the fixes too). | | `steamFrame.firefox.desktopProfile` | null or str | `"desktop"` | Separate profile for the nested desktop; `null`: none. | -| `steamFrame.jellyfin.hardwareDecoding.enable` | bool | `true` if nix-flatpak installs Jellyfin Desktop, else `false` | Hardware video decoding in the Jellyfin Desktop Flatpak, see [Jellyfin](#jellyfin-hardware-decoding-jellyfinhardwaredecoding). | +| `steamFrame.jellyfin.hardwareDecoding.enable` | bool | `false` | Hardware video decoding in the Jellyfin Desktop Flatpak, see [Jellyfin](#jellyfin-hardware-decoding-jellyfinhardwaredecoding). | | `steamFrame.jellyfin.hardwareDecoding.hwdec` | str | `"v4l2m2m-copy,auto-copy"` | mpv `hwdec` used instead of Jellyfin's automatic one. | Renamed options still work under their old names, with a warning: @@ -811,7 +811,7 @@ associations keep working. Firefox looks frozen. `full-screen-api.ignore-widgets` makes fullscreen fill just the window. **Remove when** gamescope shows fullscreen X11 windows in VR. -- **`disableAv1`** (on by default): `media.av1.enabled = false`. The Frame's +- **`disableAv1`**: `media.av1.enabled = false`. The Frame's decoder driver (`iris`) has no AV1, only H.264, HEVC and VP9, so YouTube and co. send VP9/H.264, decoded in hardware, instead of software AV1. **Remove when** a SteamOS kernel adds AV1 to `iris`. @@ -865,10 +865,6 @@ its store path (only that one, read-only) to the sandbox. It would work for any libmpv app that sets `hwdec=auto*`, but only Jellyfin Desktop is set up here. -On by default when nix-flatpak installs the app -(`services.flatpak.packages` contains `org.jellyfin.JellyfinDesktop`); -otherwise set `enable = true` yourself. - The override goes through nix-flatpak's `services.flatpak.overrides` if [nix-flatpak](https://github.com/gmodena/nix-flatpak) is imported and enabled (merged with your own overrides there). Without it, home-manager diff --git a/modules/firefox.nix b/modules/firefox.nix index 388e6f7..dac7cab 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -134,7 +134,7 @@ in { }; disableAv1 = lib.mkOption { type = lib.types.bool; - default = true; + default = false; description = '' Default media.av1.enabled to false: the Frame's decoder driver has no AV1 (H.264, HEVC, VP9 only), so sites like YouTube send VP9/H.264, diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix index 1756d52..d4e8352 100644 --- a/modules/jellyfin.nix +++ b/modules/jellyfin.nix @@ -34,9 +34,7 @@ in { options.steamFrame.jellyfin.hardwareDecoding = { enable = lib.mkOption { type = lib.types.bool; - default = lib.any (p: (if builtins.isString p then p else p.appId or null) == app) - (config.services.flatpak.packages or [ ]); - defaultText = lib.literalMD "`true` if nix-flatpak installs `org.jellyfin.JellyfinDesktop` (`services.flatpak.packages`), else `false`"; + default = false; description = '' Hardware video decoding (the Frame's V4L2 decoder) in the Jellyfin Desktop Flatpak: device access for the sandbox (devices=all) and an diff --git a/template/home.nix b/template/home.nix index 705f3e5..0ad7b02 100644 --- a/template/home.nix +++ b/template/home.nix @@ -54,8 +54,10 @@ # frameControls.enable = true; # }; # firefox.enable = true; # launcher for the Firefox Flatpak - # # Jellyfin Desktop Flatpak: hardware video decoding is on by itself - # # when nix-flatpak installs it; otherwise (gives it devices=all): - # # jellyfin.hardwareDecoding.enable = true; + # # the Frame has no AV1 decoder: sites send VP9/H.264 (hardware): + # firefox.disableAv1 = true; + # # Hardware video decoding in the Jellyfin Desktop Flatpak (install + # # org.jellyfin.JellyfinDesktop yourself); gives it devices=all: + # jellyfin.hardwareDecoding.enable = true; # }; }