mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-02-28 12:40:14 +00:00
Merge branch 'main' into testing
This commit is contained in:
commit
80e24b4045
@ -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/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/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/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/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/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 && \
|
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 \
|
powertop \
|
||||||
i2c-tools \
|
i2c-tools \
|
||||||
joystickwake \
|
joystickwake \
|
||||||
hl2linux-selinux \
|
|
||||||
udica \
|
udica \
|
||||||
joycond \
|
joycond \
|
||||||
ladspa-caps-plugins \
|
ladspa-caps-plugins \
|
||||||
@ -296,7 +294,8 @@ RUN rpm-ostree install \
|
|||||||
cockpit-selinux \
|
cockpit-selinux \
|
||||||
cockpit-system \
|
cockpit-system \
|
||||||
cockpit-navigator \
|
cockpit-navigator \
|
||||||
cockpit-storaged && \
|
cockpit-storaged \
|
||||||
|
lsb_release && \
|
||||||
pip install --prefix=/usr topgrade && \
|
pip install --prefix=/usr topgrade && \
|
||||||
rpm-ostree install \
|
rpm-ostree install \
|
||||||
ublue-update && \
|
ublue-update && \
|
||||||
@ -430,7 +429,9 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
|
|||||||
rom-properties-kf5 \
|
rom-properties-kf5 \
|
||||||
qvtf \
|
qvtf \
|
||||||
ptyxis && \
|
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 && \
|
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=KWin/Script --global --install /tmp/kwin-system76-scheduler-integration && \
|
||||||
kpackagetool5 --type=Plasma/Wallpaper --global --install /tmp/wallpaper-engine-kde-plugin/plugin && \
|
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_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-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-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-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-wallpaper-engine-kde-plugin.repo && \
|
||||||
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.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.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-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-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-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_kylegospo-wallpaper-engine-kde-plugin.repo && \
|
||||||
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.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.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-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-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-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-wallpaper-engine-kde-plugin.repo && \
|
||||||
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \
|
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \
|
||||||
|
@ -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/) |  |
|
| [gcadapter_oc-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) |  |
|
||||||
| [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) |  |
|
| [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) |  |
|
||||||
| [hhd](https://github.com/hhd-dev/hhd) |  |
|
| [hhd](https://github.com/hhd-dev/hhd) |  |
|
||||||
| [hl2linux-selinux](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/) |  |
|
|
||||||
| [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) |  |
|
| [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) |  |
|
||||||
| [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) |  |
|
| [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) |  |
|
||||||
| [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) |  |
|
| [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) |  |
|
||||||
|
@ -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/) |  |
|
| [gcadapter_oc-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) |  |
|
||||||
| [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) |  |
|
| [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) |  |
|
||||||
| [hhd](https://github.com/hhd-dev/hhd) |  |
|
| [hhd](https://github.com/hhd-dev/hhd) |  |
|
||||||
| [hl2linux-selinux](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/) |  |
|
|
||||||
| [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) |  |
|
| [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) |  |
|
||||||
| [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) |  |
|
| [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) |  |
|
||||||
| [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) |  |
|
| [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) |  |
|
||||||
|
@ -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/) |  |
|
| [gcadapter_oc-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) |  |
|
||||||
| [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) |  |
|
| [gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/) |  |
|
||||||
| [hhd](https://github.com/hhd-dev/hhd) |  |
|
| [hhd](https://github.com/hhd-dev/hhd) |  |
|
||||||
| [hl2linux-selinux](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/) |  |
|
|
||||||
| [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) |  |
|
| [joycond](https://copr.fedorainfracloud.org/coprs/kylegospo/joycond/) |  |
|
||||||
| [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) |  |
|
| [kernel-fsync](https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/) |  |
|
||||||
| [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) |  |
|
| [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) |  |
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
%global forgeurl https://github.com/trigg/Discover
|
%global forgeurl https://github.com/trigg/Discover
|
||||||
Version: 0.7.0
|
Version: 0.7.1
|
||||||
%forgemeta
|
%forgemeta
|
||||||
|
|
||||||
Name: discover-overlay
|
Name: discover-overlay
|
||||||
|
@ -24,7 +24,7 @@ process-scheduler enable=true {
|
|||||||
// Preset process assignment profiles
|
// Preset process assignment profiles
|
||||||
assignments {
|
assignments {
|
||||||
// Prevent crackling and distortion from the sound server
|
// 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"
|
||||||
"/usr/bin/pipewire-pulse"
|
"/usr/bin/pipewire-pulse"
|
||||||
"/usr/bin/jackd"
|
"/usr/bin/jackd"
|
||||||
|
@ -24,7 +24,7 @@ process-scheduler enable=true {
|
|||||||
// Preset process assignment profiles
|
// Preset process assignment profiles
|
||||||
assignments {
|
assignments {
|
||||||
// Prevent crackling and distortion from the sound server
|
// 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"
|
||||||
"/usr/bin/pipewire-pulse"
|
"/usr/bin/pipewire-pulse"
|
||||||
"/usr/bin/jackd"
|
"/usr/bin/jackd"
|
||||||
|
@ -140,8 +140,13 @@ configure-powerprofile ACTION="":
|
|||||||
echo " Use 'balanced' to select Balanced"
|
echo " Use 'balanced' to select Balanced"
|
||||||
exit 0
|
exit 0
|
||||||
elif [ "$OPTION" == "" ]; then
|
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 "${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 "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 "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!"
|
echo "${invert}${b}Please test with the default power profile set to Balanced${n} before reporting!"
|
||||||
@ -151,19 +156,11 @@ configure-powerprofile ACTION="":
|
|||||||
fi
|
fi
|
||||||
if [[ "${OPTION,,}" =~ powersave ]]; then
|
if [[ "${OPTION,,}" =~ powersave ]]; then
|
||||||
echo "Setting default powerprofile to ${b}Powersave${n}"
|
echo "Setting default powerprofile to ${b}Powersave${n}"
|
||||||
bash -c 'cat << PPD > ~/.config/autostart/bazzite-powersave.desktop
|
sudo sed -iE 's/default=(.+)/default=powersave/' /etc/tuned/ppd.conf
|
||||||
[Desktop Entry]
|
|
||||||
Exec=/usr/bin/bazzite-powersave
|
|
||||||
Icon=dialog-scripts
|
|
||||||
Name=bazzite-powersave
|
|
||||||
Type=Application
|
|
||||||
PPD'
|
|
||||||
bazzite-powersave
|
bazzite-powersave
|
||||||
elif [[ "${OPTION,,}" =~ balanced ]]; then
|
elif [[ "${OPTION,,}" =~ balanced ]]; then
|
||||||
echo "Setting default powerprofile to ${b}Balanced${n}"
|
echo "Setting default powerprofile to ${b}Balanced${n}"
|
||||||
if [ -f "~/.config/autostart/bazzite-powersave.desktop" ]; then
|
sudo sed -iE 's/default=(.+)/default=balanced/' /etc/tuned/ppd.conf
|
||||||
rm ~/.config/autostart/bazzite-powersave.desktop
|
|
||||||
fi
|
|
||||||
bazzite-powersave 0
|
bazzite-powersave 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user