[pull] bluefin-main from ublue-os:main

Containerfile

@@ -30,7 +30,14 @@ RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \
             vte-profile && \
         rpm-ostree install \
             prompt && \
-        rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo \
+        rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
+        rpm-ostree override remove \
+            power-profiles-daemon \
+            || true && \
+        rpm-ostree override remove \
+            tlp \
+            tlp-rdw \
+            || true \
     ; fi
 
 COPY usr /usr
@@ -81,6 +88,9 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
     printf "\n\n[Install]\nWantedBy=bluefin-cli.target" >> /usr/etc/containers/systemd/users/bluefin-cli.container  && \
     sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/bluefin-cli.container && \
     sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /usr/etc/containers/systemd/users/bluefin-cli.container && \
+    if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \
+        systemctl enable tuned.service \
+    ; fi && \
     systemctl enable rpm-ostree-countme.service && \
     systemctl enable tailscaled.service && \
     systemctl enable dconf-update.service && \
@@ -132,15 +142,13 @@ RUN sysctl -p
 
 RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
-    wget https://copr.fedorainfracloud.org/coprs/karmab/kcli/repo/fedora-"${FEDORA_MAJOR_VERSION}"/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo
+    wget https://copr.fedorainfracloud.org/coprs/karmab/kcli/repo/fedora-"${FEDORA_MAJOR_VERSION}"/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
+    wget https://copr.fedorainfracloud.org/coprs/atim/ubuntu-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo
 
 # Handle packages via packages.json
 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
 
@@ -175,6 +183,7 @@ RUN /tmp/workarounds.sh
 RUN rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     rm -f /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
+    rm -f /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     rm -f /etc/yum.repos.d/vscode.repo && \
     rm -f /etc/yum.repos.d/docker-ce.repo && \
     rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo && \

packages.json

@@ -47,6 +47,7 @@
 			],
 			"bluefin-dx": [
 				"adobe-source-code-pro-fonts",
+				"cascadia-code-fonts",
 				"cockpit-machines",
 				"cockpit-networkmanager",
 				"cockpit-ostree",
@@ -96,6 +97,7 @@
 				"qemu-user-binfmt",
 				"qemu-user-static",
 				"qemu",
+				"ubuntu-family-fonts",
 				"virt-manager",
 				"virt-viewer"
 			]
@@ -132,7 +134,12 @@
 			"bluefin": [
 				"gnome-shell-extension-tailscale-gnome-qs",
 				"input-leap",
-                                "nautilus-open-any-terminal"
+				"nautilus-open-any-terminal",
+				"tuned",
+				"tuned-ppd",
+				"tuned-utils",
+				"tuned-utils-systemtap",
+				"tuned-profiles-atomic"
 			],
 			"bluefin-dx": [],
 			"bluefin-framework": []

usr/bin/ublue-system-flatpak-manager

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Script Version
-VER=1
+VER=2
 VER_FILE="/etc/ublue/flatpak_manager_version"
 VER_RAN=$(cat $VER_FILE)
 
@@ -11,11 +11,16 @@ if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
   exit 0
 fi
 
-# Remove fedora flatpak repo
+# Opt out of and remove Fedora's flatpak repo
 if grep -qz 'fedora' <<< $(flatpak remotes); then
-  flatpak remote-delete --user fedora --force
+  /usr/lib/fedora-third-party/fedora-third-party-opt-out
+  /usr/bin/fedora-third-party disable
+  flatpak remote-delete fedora --force
 fi
 
+# Ensure Flathub is enabled
+flatpak remote-modify --system --enable flathub
+
 # Lists of flatpaks
 FLATPAK_LIST=$(flatpak list --columns=application)
 INSTALL_LIST=$(cat /etc/flatpak/system/install)
@@ -34,25 +39,5 @@ if [[ ! -f $VER_FILE && -n $REMOVE_LIST ]]; then
   flatpak remove --system --noninteractive ${REMOVE_LIST[@]}
 fi
 
-# Opt out of and remove Fedora's flatpak repo
-if grep -qz 'fedora' <<< $(flatpak remotes); then
-  /usr/lib/fedora-third-party/fedora-third-party-opt-out
-  /usr/bin/fedora-third-party disable
-  flatpak remote-delete fedora --force
-
-  # Remove flatpak apps from origin fedora
-  FEDORA_FLATPAKS=$(flatpak list --app --columns=application,origin | grep -w 'fedora' | awk '{print $1}')
-  flatpak remove --system --noninteractive ${FEDORA_FLATPAKS[@]}
-
-  # Remove flatpak runtimes from origin fedora
-  FEDORA_FLATPAKS=$(flatpak list --runtime --columns=application,arch,branch,origin | grep -w 'fedora' | awk '{print $1"/"$2"/"$3}')
-  flatpak remove --system --noninteractive ${FEDORA_FLATPAKS[@]}
-fi
-
-# Disable the system variant of the flathub repo
-flatpak remote-modify flathub --disable --system
-
-notify-send "Flatpak installer" "Finished installing system flatpaks" --app-name="Flatpak installer" -u NORMAL
-
 mkdir -p /etc/ublue
 echo $VER > $VER_FILE

usr/bin/ublue-user-flatpak-manager

@@ -23,8 +23,12 @@ if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
   exit 0
 fi
 
-# Setup Flathub
+# Enable Flathub
+if grep -qz 'fedora' <<< $(flatpak remotes); then
+  flatpak remote-delete --user fedora --force
+fi
 flatpak remote-add --if-not-exists --user flathub /etc/flatpak/remotes.d/flathub.flatpakrepo
+flatpak remote-modify --user --enable flathub
 
 # Lists of flatpaks
 FLATPAK_LIST=$(flatpak list --columns=application)

usr/etc/flatpak/system/install

@@ -0,0 +1,24 @@
+org.mozilla.firefox
+org.freedesktop.Platform.ffmpeg-full//22.08
+org.gnome.Calculator
+org.gnome.Calendar
+org.gnome.Characters
+org.gnome.Connections
+org.gnome.Contacts
+org.gnome.Evince
+org.gnome.Loupe
+org.gnome.Logs
+org.gnome.Maps
+org.gnome.NautilusPreviewer
+org.gnome.TextEditor
+org.gnome.Weather
+org.gnome.baobab
+org.gnome.clocks
+org.gnome.font-viewer
+com.mattjakeman.ExtensionManager
+com.github.tchx84.Flatseal
+io.github.flattool.Warehouse
+com.github.marhkb.Pod
+org.fedoraproject.MediaWriter
+io.missioncenter.MissionCenter
+io.github.celluloid_player.Celluloid

usr/etc/flatpak/user/install

@@ -1,24 +0,0 @@
-org.mozilla.firefox
-org.freedesktop.Platform.ffmpeg-full//22.08
-org.gnome.Calculator
-org.gnome.Calendar
-org.gnome.Characters
-org.gnome.Connections
-org.gnome.Contacts
-org.gnome.Evince
-org.gnome.Loupe
-org.gnome.Logs
-org.gnome.Maps
-org.gnome.NautilusPreviewer
-org.gnome.TextEditor
-org.gnome.Weather
-org.gnome.baobab
-org.gnome.clocks
-org.gnome.font-viewer
-com.mattjakeman.ExtensionManager
-com.github.tchx84.Flatseal
-io.github.flattool.Warehouse
-com.github.marhkb.Pods
-org.fedoraproject.MediaWriter
-io.missioncenter.MissionCenter
-io.github.celluloid_player.Celluloid

usr/etc/flatpak/user/remove

@@ -0,0 +1,24 @@
+org.mozilla.firefox
+org.freedesktop.Platform.ffmpeg-full//22.08
+org.gnome.Calculator
+org.gnome.Calendar
+org.gnome.Characters
+org.gnome.Connections
+org.gnome.Contacts
+org.gnome.Evince
+org.gnome.Loupe
+org.gnome.Logs
+org.gnome.Maps
+org.gnome.NautilusPreviewer
+org.gnome.TextEditor
+org.gnome.Weather
+org.gnome.baobab
+org.gnome.clocks
+org.gnome.font-viewer
+com.mattjakeman.ExtensionManager
+com.github.tchx84.Flatseal
+io.github.flattool.Warehouse
+com.github.marhkb.Pod
+org.fedoraproject.MediaWriter
+io.missioncenter.MissionCenter
+io.github.celluloid_player.Celluloid

usr/share/ublue-os/motd/bluefin.md

@@ -1,4 +1,4 @@
-# Welcome to Bluefin (󰂡eta) 
+# 󱍢 Welcome to Bluefin (󰂡eta) 
 : `%IMAGE_NAME%:%IMAGE_TAG%`
 
 | Command | Description |

usr/share/ublue-os/motd/tips/10-tips.md

@@ -1,6 +1,12 @@
-The Project Bluefin team will use this banner to share important information and occasional tips.
-Check out Justin Garrison's [Introduction to Bluefin](https://www.youtube.com/watch?v=Nz-yyDwTfRM)
-Check out the Bluefin [introductory video](https://www.youtube.com/watch?v=YFXufAVdrw4)
+The Project Bluefin team will use this banner to share important information and occasional tips
+Follow us on 󰫑 [@[email protected]](https://fosstodon.org/@UniversalBlue)
+Bluefin is your gateway to Kubernetes 󱃾 `kind create cluster` to [get started](https://kind.sigs.k8s.io/)
+Bluefin is your gateway to Cloud Native - find your flock at [landscape.cncf.io](https://l.cncf.io)
+Support the app store! Donate to  [Flatpak](https://opencollective.com/flatpak)
+Bluefin is proudly built using 󰣛 Fedora technology with a bit of  Ubuntu flavor
+Check out Justin Garrison's 󰗃[Introduction to Bluefin](https://www.youtube.com/watch?v=Nz-yyDwTfRM)
+Check out the Bluefin 󰗃[announcement video](https://www.youtube.com/watch?v=YFXufAVdrw4)
 Need more indepth technical information? Check out the [Bluefin Administrator's Guide](https://universal-blue.discourse.group/docs?topic=40)
 Support [Bluefin's Paleoartists](https://universal-blue.discourse.group/docs?topic=299)
+Like servers? Check out [ucore](https://github.com/ublue-os/ucore)
 Update break something? You can roll back and pin the previous release or rebase by build date: [View our guide](https://universal-blue.discourse.group/docs?topic=513)