Skip to content

Commit

Permalink
Merge branch 'tuned' into testing
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleGospo committed Jan 27, 2024
2 parents 9ab264e + 0f34d93 commit 87e19d0
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
14 changes: 11 additions & 3 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
; fi && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo

# Remove PPD & TLP
RUN rpm-ostree override remove \
power-profiles-daemon \
|| true && \
rpm-ostree override remove \
tlp \
tlp-rdw \
|| true

# Starship Shell Prompt
RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \
tar -xzf /tmp/starship.tar.gz -C /tmp && \
Expand All @@ -76,6 +85,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
mkdir -p /usr/etc/flatpak/remotes.d && \
wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \
cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml && \
systemctl enable tuned.service && \
systemctl enable rpm-ostree-countme.service && \
systemctl enable tailscaled.service && \
systemctl enable dconf-update.service && \
Expand All @@ -94,6 +104,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
echo "Hidden=true" >> /usr/share/applications/htop.desktop && \
echo "Hidden=true" >> /usr/share/applications/nvtop.desktop && \
echo "Hidden=true" >> /usr/share/applications/gnome-system-monitor.desktop && \
sed -i 's@Name=tuned-gui@Name=TuneD Manager@g' /usr/share/applications/tuned-gui.desktop && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release && \
Expand Down Expand Up @@ -133,9 +144,6 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDOR
RUN /tmp/build.sh && \
/tmp/image-info.sh

## power-profiles-daemon with amd p-state support, remove when this is upstream
RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging power-profiles-daemon

RUN wget https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64 -O /tmp/docker-compose && \
install -c -m 0755 /tmp/docker-compose /usr/bin

Expand Down
8 changes: 8 additions & 0 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@
"stress-ng",
"tailscale",
"tmux",
"tuned",
"tuned-ppd",
"tuned-utils",
"tuned-utils-systemtap",
"tuned-gtk",
"tuned-profiles-atomic",
"tuned-profiles-cpu-partitioning",
"ublue-update",
"usbmuxd",
"wireguard-tools",
"xprop",
Expand Down

0 comments on commit 87e19d0

Please sign in to comment.