mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-02-28 22:13:30 +00:00
Merge branch 'testing'
This commit is contained in:
commit
01ea8dcd6b
@ -23,7 +23,6 @@ COPY system_files/desktop/shared system_files/desktop/${BASE_IMAGE_NAME} /
|
||||
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
|
||||
wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-multilib-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
|
||||
wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_ublue-os-staging.repo && \
|
||||
wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rpm -E %fedora)/ublue-os-bling-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os-bling.repo && \
|
||||
wget https://copr.fedorainfracloud.org/coprs/kylegospo/system76-scheduler/repo/fedora-$(rpm -E %fedora)/kylegospo-system76-scheduler-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-system76-scheduler.repo && \
|
||||
wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \
|
||||
wget https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/repo/fedora-$(rpm -E %fedora)/kylegospo-hl2linux-selinux-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \
|
||||
@ -211,7 +210,6 @@ RUN rpm-ostree override remove \
|
||||
|
||||
# Install new packages
|
||||
RUN rpm-ostree install \
|
||||
ublue-update \
|
||||
discover-overlay \
|
||||
python3-pip \
|
||||
libadwaita \
|
||||
@ -263,6 +261,14 @@ RUN rpm-ostree install \
|
||||
gum \
|
||||
setools \
|
||||
redhat-lsb-core && \
|
||||
pip install --prefix=/usr topgrade && \
|
||||
rpm-ostree install \
|
||||
ublue-update && \
|
||||
sed -i '1s/^/[include]\npaths = ["\/etc\/ublue-os\/topgrade.toml"]\n\n/' /usr/etc/ublue-update/topgrade-user.toml && \
|
||||
sed -i 's/min_battery_percent.*/min_battery_percent = 30.0/' /usr/etc/ublue-update/ublue-update.toml && \
|
||||
sed -i 's/max_cpu_load_percent.*/max_cpu_load_percent = 90.0/' /usr/etc/ublue-update/ublue-update.toml && \
|
||||
sed -i 's/max_mem_percent.*/max_mem_percent = 90.0/' /usr/etc/ublue-update/ublue-update.toml && \
|
||||
sed -i 's/dbus_notify.*/dbus_notify = true/' /usr/etc/ublue-update/ublue-update.toml && \
|
||||
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo && \
|
||||
rpm-ostree install \
|
||||
nerd-fonts && \
|
||||
@ -454,14 +460,12 @@ RUN /tmp/image-info.sh && \
|
||||
echo "import \"/usr/share/ublue-os/just/85-bazzite-image.just\"" >> /usr/share/ublue-os/justfile && \
|
||||
echo "import \"/usr/share/ublue-os/just/90-bazzite-de.just\"" >> /usr/share/ublue-os/justfile && \
|
||||
pip install --prefix=/usr yafti && \
|
||||
pip install --prefix=/usr topgrade && \
|
||||
pip install --prefix=/usr hyfetch && \
|
||||
sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \
|
||||
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.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_ublue-os-staging.repo && \
|
||||
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-bling.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 && \
|
||||
@ -658,6 +662,8 @@ RUN /tmp/image-info.sh && \
|
||||
rm -f /usr/share/applications/com.github.maliit.keyboard.desktop \
|
||||
; fi && \
|
||||
sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/input-remapper-gtk.desktop && \
|
||||
sed -i 's/max_cpu_load_percent.*/max_cpu_load_percent = 100.0/' /usr/etc/ublue-update/ublue-update.toml && \
|
||||
sed -i 's/dbus_notify.*/dbus_notify = false/' /usr/etc/ublue-update/ublue-update.toml && \
|
||||
cp "/usr/share/ublue-os/firstboot/yafti.yml" "/usr/etc/yafti.yml" && \
|
||||
sed -i 's/#HandlePowerKey=poweroff/HandlePowerKey=suspend/g' /etc/systemd/logind.conf && \
|
||||
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
|
||||
|
@ -1,7 +0,0 @@
|
||||
[checks]
|
||||
min_battery_percent = 30.0
|
||||
max_cpu_load_percent = 100.0
|
||||
max_mem_percent = 90.0
|
||||
[notify]
|
||||
dbus_notify = false
|
||||
|
@ -1,16 +0,0 @@
|
||||
[include]
|
||||
paths = ["/etc/ublue-os/topgrade.toml"]
|
||||
|
||||
[misc]
|
||||
only = ["flatpak", "distrobox"]
|
||||
ignore_failures = ["flatpak", "distrobox"]
|
||||
skip_notify = true
|
||||
assume_yes = true
|
||||
no_retry = true
|
||||
no_self_update = true
|
||||
|
||||
[distrobox]
|
||||
use_root = false
|
||||
|
||||
[flatpak]
|
||||
use_sudo = false
|
@ -1,7 +0,0 @@
|
||||
[checks]
|
||||
min_battery_percent = 30.0
|
||||
max_cpu_load_percent = 90.0
|
||||
max_mem_percent = 90.0
|
||||
[notify]
|
||||
dbus_notify = true
|
||||
|
@ -1,7 +0,0 @@
|
||||
#!/usr/bin/bash
|
||||
shopt -s nullglob
|
||||
|
||||
if [ -d "$HOME/homebrew/themes/Adwaita-for-Steam" ]; then
|
||||
cd "$HOME/homebrew/themes/Adwaita-for-Steam"
|
||||
git pull
|
||||
fi
|
@ -1,18 +0,0 @@
|
||||
#!/usr/bin/bash
|
||||
shopt -s nullglob
|
||||
|
||||
# Flatpak Firefox
|
||||
for firefox_gnome_theme in "$HOME/.var/app/org.mozilla.firefox/.mozilla/firefox/"*".default"*"/chrome/firefox-gnome-theme/"; do
|
||||
if [ -d "$firefox_gnome_theme" ]; then
|
||||
cd "$firefox_gnome_theme"
|
||||
git pull
|
||||
fi
|
||||
done
|
||||
|
||||
# Flatpak Thunderbird
|
||||
for thunderbird_gnome_theme in "$HOME/.var/app/org.mozilla.Thunderbird/.thunderbird/"*".default"*"/chrome/thunderbird-gnome-theme/"; do
|
||||
if [ -d "$thunderbird_gnome_theme" ]; then
|
||||
cd "$thunderbird_gnome_theme"
|
||||
git pull
|
||||
fi
|
||||
done
|
Loading…
x
Reference in New Issue
Block a user