diff --git a/Containerfile b/Containerfile index f98206db..f02b9ef2 100644 --- a/Containerfile +++ b/Containerfile @@ -25,7 +25,6 @@ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-" wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo?arch=x86_64 -O /etc/yum.repos.d/_copr_ublue-os-staging.repo && \ wget https://copr.fedorainfracloud.org/coprs/kylegospo/system76-scheduler/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-system76-scheduler-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-system76-scheduler.repo && \ wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-LatencyFleX-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ - wget https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-hl2linux-selinux-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \ wget https://copr.fedorainfracloud.org/coprs/kylegospo/obs-vkcapture/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-obs-vkcapture-fedora-"${FEDORA_MAJOR_VERSION}".repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \ wget https://copr.fedorainfracloud.org/coprs/kylegospo/wallpaper-engine-kde-plugin/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-wallpaper-engine-kde-plugin-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \ wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ @@ -257,7 +256,6 @@ RUN rpm-ostree install \ powertop \ i2c-tools \ joystickwake \ - hl2linux-selinux \ udica \ joycond \ ladspa-caps-plugins \ @@ -296,7 +294,8 @@ RUN rpm-ostree install \ cockpit-selinux \ cockpit-system \ cockpit-navigator \ - cockpit-storaged && \ + cockpit-storaged \ + lsb_release && \ pip install --prefix=/usr topgrade && \ rpm-ostree install \ ublue-update && \ @@ -430,7 +429,9 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \ rom-properties-kf5 \ qvtf \ ptyxis && \ - git clone https://github.com/maxiberta/kwin-system76-scheduler-integration.git --depth 1 /tmp/kwin-system76-scheduler-integration && \ + mkdir -p /tmp/kwin-system76-scheduler-integration && \ + wget https://github.com/maxiberta/kwin-system76-scheduler-integration/archive/374a261497c772571df93f59fbced0ad02e64ad5.tar.gz -O /tmp/kwin-system76-scheduler-integration/archive.tar.gz && \ + tar --strip-components 1 -xvf /tmp/kwin-system76-scheduler-integration/archive.tar.gz -C /tmp/kwin-system76-scheduler-integration && \ git clone https://github.com/catsout/wallpaper-engine-kde-plugin.git --depth 1 /tmp/wallpaper-engine-kde-plugin && \ kpackagetool5 --type=KWin/Script --global --install /tmp/kwin-system76-scheduler-integration && \ kpackagetool5 --type=Plasma/Wallpaper --global --install /tmp/wallpaper-engine-kde-plugin/plugin && \ @@ -545,7 +546,6 @@ RUN /tmp/image-info.sh && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-system76-scheduler.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ @@ -622,7 +622,6 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \ @@ -746,7 +745,6 @@ RUN /tmp/image-info.sh && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \ diff --git a/README-ID.md b/README-ID.md index c7fba285..4b8951da 100644 --- a/README-ID.md +++ b/README-ID.md @@ -271,7 +271,6 @@ Sebagai tambahan, paket-paket berikut ini digunakan dari repository Copr: | [gcadapter_oc-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/package/gcadapter_oc-kmod/status_image/last_build.png?) | | [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/package/mutter/status_image/last_build.png?) | | [hhd](https://github.com/hhd-dev/hhd) | ![Build Status](https://copr.fedorainfracloud.org/coprs/hhd-dev/hhd/package/hhd/status_image/last_build.png?) | -| [hl2linux-selinux](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/package/hl2linux-selinux/status_image/last_build.png?) | | [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/package/joycond/status_image/last_build.png?) | | [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/package/kernel/status_image/last_build.png?) | | [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/package/latencyflex-vulkan-layer/status_image/last_build.png?) | diff --git a/README-SPA.md b/README-SPA.md index ad0d8914..4849db0a 100644 --- a/README-SPA.md +++ b/README-SPA.md @@ -322,7 +322,6 @@ Adicionalmente, los paquetes listados a continuación provienen de otros reposit | [gcadapter_oc-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/package/gcadapter_oc-kmod/status_image/last_build.png?) | | [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/package/mutter/status_image/last_build.png?) | | [hhd](https://github.com/hhd-dev/hhd) | ![Build Status](https://copr.fedorainfracloud.org/coprs/hhd-dev/hhd/package/hhd/status_image/last_build.png?) | -| [hl2linux-selinux](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/package/hl2linux-selinux/status_image/last_build.png?) | | [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/package/joycond/status_image/last_build.png?) | | [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/package/kernel/status_image/last_build.png?) | | [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/package/latencyflex-vulkan-layer/status_image/last_build.png?) | diff --git a/README.md b/README.md index 9f6a0d71..53c49e1f 100644 --- a/README.md +++ b/README.md @@ -307,7 +307,6 @@ Additionally, the following packages are used from other Copr repos: | [gcadapter_oc-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/package/gcadapter_oc-kmod/status_image/last_build.png?) | | [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/package/mutter/status_image/last_build.png?) | | [hhd](https://github.com/hhd-dev/hhd) | ![Build Status](https://copr.fedorainfracloud.org/coprs/hhd-dev/hhd/package/hhd/status_image/last_build.png?) | -| [hl2linux-selinux](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/package/hl2linux-selinux/status_image/last_build.png?) | | [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/package/joycond/status_image/last_build.png?) | | [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/package/kernel/status_image/last_build.png?) | | [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/package/latencyflex-vulkan-layer/status_image/last_build.png?) | diff --git a/spec_files/discover-overlay/discover-overlay.spec b/spec_files/discover-overlay/discover-overlay.spec index ee336230..034df941 100644 --- a/spec_files/discover-overlay/discover-overlay.spec +++ b/spec_files/discover-overlay/discover-overlay.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/trigg/Discover -Version: 0.7.0 +Version: 0.7.1 %forgemeta Name: discover-overlay diff --git a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl index 135b1525..a41bf747 100644 --- a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl +++ b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl @@ -24,7 +24,7 @@ process-scheduler enable=true { // Preset process assignment profiles assignments { // Prevent crackling and distortion from the sound server - sound-server nice=-15 sched=(fifo)49 io=(realtime)0 { + sound-server nice=-15 io=(realtime)0 { "/usr/bin/pipewire" "/usr/bin/pipewire-pulse" "/usr/bin/jackd" diff --git a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl index 402d0bfd..58b63327 100644 --- a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl +++ b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl @@ -24,7 +24,7 @@ process-scheduler enable=true { // Preset process assignment profiles assignments { // Prevent crackling and distortion from the sound server - sound-server nice=-15 sched=(fifo)49 io=(realtime)0 { + sound-server nice=-15 io=(realtime)0 { "/usr/bin/pipewire" "/usr/bin/pipewire-pulse" "/usr/bin/jackd" diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just index 5ecd10fd..ac3f4781 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just @@ -140,8 +140,13 @@ configure-powerprofile ACTION="": echo " Use 'balanced' to select Balanced" exit 0 elif [ "$OPTION" == "" ]; then + # Cleanup old method + if [ -f "~/.config/autostart/bazzite-powersave.desktop" ]; then + rm ~/.config/autostart/bazzite-powersave.desktop + fi + # New method from here on echo "${bold}Power profile configuration${normal}" - echo "This lets you set the default power profile for when the desktop loads." + echo "This lets you set the default power profile." echo "We do not recommend changing this from ${b}Balanced${n} if you use this device primarily for gaming!" echo "If you have any performance or audio related issues..." echo "${invert}${b}Please test with the default power profile set to Balanced${n} before reporting!" @@ -151,19 +156,11 @@ configure-powerprofile ACTION="": fi if [[ "${OPTION,,}" =~ powersave ]]; then echo "Setting default powerprofile to ${b}Powersave${n}" - bash -c 'cat << PPD > ~/.config/autostart/bazzite-powersave.desktop - [Desktop Entry] - Exec=/usr/bin/bazzite-powersave - Icon=dialog-scripts - Name=bazzite-powersave - Type=Application - PPD' + sudo sed -iE 's/default=(.+)/default=powersave/' /etc/tuned/ppd.conf bazzite-powersave elif [[ "${OPTION,,}" =~ balanced ]]; then echo "Setting default powerprofile to ${b}Balanced${n}" - if [ -f "~/.config/autostart/bazzite-powersave.desktop" ]; then - rm ~/.config/autostart/bazzite-powersave.desktop - fi + sudo sed -iE 's/default=(.+)/default=balanced/' /etc/tuned/ppd.conf bazzite-powersave 0 fi