From 5ff1fefeeeba77572c6c3af169d9f4fd1c196f6c Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 1 Jan 2024 18:03:09 -0800 Subject: [PATCH] feat: Add default config for Firefox to handle vaapi --- Containerfile | 4 ++-- .../x86_64/stable/defaults/pref/config-prefs.js | 3 +++ .../x86_64/stable/defaults/pref/config-prefs.js | 4 ++++ .../x86_64/stable/defaults/pref/config-prefs.js | 4 ++++ system_files/nvidia/shared/usr/etc/modprobe.d/amdgpu.conf | 1 + .../usr/etc => nvidia/shared/usr/lib}/modprobe.d/nvidia.conf | 0 .../x86_64/stable/defaults/pref/config-prefs.js | 5 +++++ 7 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 system_files/desktop/kinoite/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js create mode 100644 system_files/desktop/silverblue/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js create mode 100644 system_files/nvidia/kinoite/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js create mode 100644 system_files/nvidia/shared/usr/etc/modprobe.d/amdgpu.conf rename system_files/{desktop/shared/usr/etc => nvidia/shared/usr/lib}/modprobe.d/nvidia.conf (100%) create mode 100644 system_files/nvidia/silverblue/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js diff --git a/Containerfile b/Containerfile index f4bd08fb85..76e89a245d 100644 --- a/Containerfile +++ b/Containerfile @@ -638,6 +638,7 @@ ARG NVIDIA_MAJOR_VERSION="545" # Fetch NVIDIA driver COPY --from=ghcr.io/ublue-os/akmods-nvidia:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}-${NVIDIA_MAJOR_VERSION} /rpms /tmp/akmods-rpms +COPY system_files/nvidia/shared system_files/nvidia/${BASE_IMAGE_NAME} / # Remove everything that doesn't work well with NVIDIA RUN rm -f /usr/bin/waydroid-choose-gpu && \ @@ -651,8 +652,7 @@ RUN rm -f /usr/bin/waydroid-choose-gpu && \ if [[ "${BASE_IMAGE_NAME}" == "kinoite" ]]; then \ rpm-ostree override remove \ colord-kde \ - ; fi && \ - rm -f /usr/etc/modprobe.d/amdgpu.conf + ; fi # Install NVIDIA driver RUN wget https://raw.githubusercontent.com/ublue-os/nvidia/main/install.sh -O /tmp/nvidia-install.sh && \ diff --git a/system_files/desktop/kinoite/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js b/system_files/desktop/kinoite/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js new file mode 100644 index 0000000000..fb09300dc4 --- /dev/null +++ b/system_files/desktop/kinoite/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js @@ -0,0 +1,3 @@ +// Bazzite Firefox Hardware Settings (Kinoite) +pref("gfx.webrender.all", 1); +pref("media.ffmpeg.vaapi.enabled", 1); diff --git a/system_files/desktop/silverblue/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js b/system_files/desktop/silverblue/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js new file mode 100644 index 0000000000..f89d4ba7d1 --- /dev/null +++ b/system_files/desktop/silverblue/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js @@ -0,0 +1,4 @@ +// Bazzite Firefox Hardware Settings (Silverblue) +pref("gfx.webrender.all", 1); +pref("media.ffmpeg.vaapi.enabled", 1); +pref("widget.gtk.rounded-bottom-corners.enabled", 1); diff --git a/system_files/nvidia/kinoite/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js b/system_files/nvidia/kinoite/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js new file mode 100644 index 0000000000..ea4a1a22d0 --- /dev/null +++ b/system_files/nvidia/kinoite/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js @@ -0,0 +1,4 @@ +// Bazzite Firefox Hardware Settings (Nvidia Kinoite) +pref("gfx.webrender.all", 1); +pref("media.ffmpeg.vaapi.enabled", 1); +pref("widget.dmabuf.force-enabled", 1); diff --git a/system_files/nvidia/shared/usr/etc/modprobe.d/amdgpu.conf b/system_files/nvidia/shared/usr/etc/modprobe.d/amdgpu.conf new file mode 100644 index 0000000000..d52e161321 --- /dev/null +++ b/system_files/nvidia/shared/usr/etc/modprobe.d/amdgpu.conf @@ -0,0 +1 @@ +# This file intentionally empty \ No newline at end of file diff --git a/system_files/desktop/shared/usr/etc/modprobe.d/nvidia.conf b/system_files/nvidia/shared/usr/lib/modprobe.d/nvidia.conf similarity index 100% rename from system_files/desktop/shared/usr/etc/modprobe.d/nvidia.conf rename to system_files/nvidia/shared/usr/lib/modprobe.d/nvidia.conf diff --git a/system_files/nvidia/silverblue/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js b/system_files/nvidia/silverblue/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js new file mode 100644 index 0000000000..3d1338ed23 --- /dev/null +++ b/system_files/nvidia/silverblue/var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/x86_64/stable/defaults/pref/config-prefs.js @@ -0,0 +1,5 @@ +// Bazzite Firefox Hardware Settings (Nvidia Silverblue) +pref("gfx.webrender.all", 1); +pref("media.ffmpeg.vaapi.enabled", 1); +pref("widget.dmabuf.force-enabled", 1); +pref("widget.gtk.rounded-bottom-corners.enabled", 1);