From a18336768557ef2018d7cea7f19ae0563096a6cc Mon Sep 17 00:00:00 2001 From: Nisel Date: Wed, 18 Dec 2024 12:20:27 +0200 Subject: [PATCH 1/6] chore(bluefin, removal): remove bluefin from the build system --- Justfile | 57 ++++------ build_files/base/00-image-info.sh | 16 +-- build_files/base/01-build-fix.sh | 17 +-- build_files/base/05-override-install.sh | 20 +--- build_files/base/07-base-image-changes.sh | 132 ++++++---------------- build_files/base/17-cleanup.sh | 1 + build_files/dx/09-cleanup-dx.sh | 4 +- build_files/shared/build-dx.sh | 8 +- packages.json | 33 +----- 9 files changed, 73 insertions(+), 215 deletions(-) diff --git a/Justfile b/Justfile index bf61f678..c8e646ea 100644 --- a/Justfile +++ b/Justfile @@ -4,8 +4,6 @@ iso_builder_image := "ghcr.io/jasonn3/build-container-installer:v1.2.3" images := '( [aurora]=aurora [aurora-dx]=aurora-dx - [bluefin]=bluefin - [bluefin-dx]=bluefin-dx )' flavors := '( [main]=main @@ -18,7 +16,6 @@ flavors := '( [surface-nvidia]=surface-nvidia )' tags := '( - [gts]=gts [stable]=stable [latest]=latest [beta]=beta @@ -132,7 +129,7 @@ sudoif command *args: # Build Image [group('Image')] -build image="bluefin" tag="latest" flavor="main" rechunk="0" ghcr="0" pipeline="0" kernel_pin="": +build image="aurora" tag="latest" flavor="main" rechunk="0" ghcr="0" pipeline="0" kernel_pin="": #!/usr/bin/bash set -eoux pipefail image={{ image }} @@ -146,11 +143,7 @@ build image="bluefin" tag="latest" flavor="main" rechunk="0" ghcr="0" pipeline=" image_name=$(just image_name {{ image }} {{ tag }} {{ flavor }}) # Base Image - if [[ "${image}" =~ bluefin ]]; then - base_image_name="silverblue" - elif [[ "${image}" =~ aurora ]]; then - base_image_name="kinoite" - fi + base_image_name="kinoite" # Target if [[ "${image}" =~ dx ]]; then @@ -245,12 +238,12 @@ build image="bluefin" tag="latest" flavor="main" rechunk="0" ghcr="0" pipeline=" # Build Image and Rechunk [group('Image')] -build-rechunk image="bluefin" tag="latest" flavor="main" kernel_pin="": +build-rechunk image="aurora" tag="latest" flavor="main" kernel_pin="": @just build {{ image }} {{ tag }} {{ flavor }} 1 0 0 {{ kernel_pin }} # Build Image with GHCR Flag [group('Image')] -build-ghcr image="bluefin" tag="latest" flavor="main" kernel_pin="": +build-ghcr image="aurora" tag="latest" flavor="main" kernel_pin="": #!/usr/bin/bash if [[ "${UID}" -gt "0" ]]; then echo "Must Run with sudo or as root..." @@ -260,7 +253,7 @@ build-ghcr image="bluefin" tag="latest" flavor="main" kernel_pin="": # Build Image for Pipeline: [group('Image')] -build-pipeline image="bluefin" tag="latest" flavor="main" kernel_pin="": +build-pipeline image="aurora" tag="latest" flavor="main" kernel_pin="": #!/usr/bin/bash if [[ "${UID}" -gt "0" ]]; then echo "Must Run with sudo or as root..." @@ -271,7 +264,7 @@ build-pipeline image="bluefin" tag="latest" flavor="main" kernel_pin="": # Rechunk Image [group('Image')] [private] -rechunk image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": +rechunk image="aurora" tag="latest" flavor="main" ghcr="0" pipeline="0": #!/usr/bin/bash set -eoux pipefail @@ -315,11 +308,7 @@ rechunk image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": # Cleanup Space during Github Action if [[ "{{ ghcr }}" == "1" ]]; then - if [[ "${image_name}" =~ bluefin ]]; then - base_image_name=silverblue-main - elif [[ "${image_name}" =~ aurora ]]; then - base_image_name=kinoite-main - fi + base_image_name=kinoite-main if [[ "${tag}" =~ stable ]]; then tag="stable-daily" fi @@ -405,7 +394,7 @@ rechunk image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": # Load OCI into Podman Store [group('Image')] -load-rechunk image="bluefin" tag="latest" flavor="main": +load-rechunk image="aurora" tag="latest" flavor="main": #!/usr/bin/bash set -eou pipefail @@ -426,7 +415,7 @@ load-rechunk image="bluefin" tag="latest" flavor="main": # Run Container [group('Image')] -run image="bluefin" tag="latest" flavor="main": +run image="aurora" tag="latest" flavor="main": #!/usr/bin/bash set -eoux pipefail image={{ image }} @@ -450,7 +439,7 @@ run image="bluefin" tag="latest" flavor="main": # Build ISO [group('ISO')] -build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": +build-iso image="aurora" tag="latest" flavor="main" ghcr="0" pipeline="0": #!/usr/bin/bash set -eoux pipefail image={{ image }} @@ -493,12 +482,8 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": just sudoif podman image scp "${UID}"@localhost::"${IMAGE_FULL}" root@localhost::"${IMAGE_FULL}" fi - # Flatpak list for bluefin/aurora - if [[ "${image_name}" =~ bluefin ]]; then - FLATPAK_DIR_SHORTNAME="bluefin_flatpaks" - elif [[ "${image_name}" =~ aurora ]]; then - FLATPAK_DIR_SHORTNAME="aurora_flatpaks" - fi + # Flatpaks list for aurora + FLATPAK_DIR_SHORTNAME="aurora_flatpaks" # Generate Flatpak List TEMP_FLATPAK_INSTALL_DIR="$(mktemp -d -p /tmp flatpak-XXXXX)" @@ -570,11 +555,7 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": iso_build_args+=(IMAGE_TAG="${tag}") iso_build_args+=(ISO_NAME="/github/workspace/${build_dir}/${image_name}-${tag}.iso") iso_build_args+=(SECURE_BOOT_KEY_URL="https://github.com/ublue-os/akmods/raw/main/certs/public_key.der") - if [[ "${image_name}" =~ bluefin ]]; then - iso_build_args+=(VARIANT="Silverblue") - else - iso_build_args+=(VARIANT="Kinoite") - fi + iso_build_args+=(VARIANT="Kinoite") iso_build_args+=(VERSION="${FEDORA_VERSION}") iso_build_args+=(WEB_UI="false") @@ -588,12 +569,12 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": # Build ISO using GHCR Image [group('ISO')] -build-iso-ghcr image="bluefin" tag="latest" flavor="main": +build-iso-ghcr image="aurora" tag="latest" flavor="main": @just build-iso {{ image }} {{ tag }} {{ flavor }} 1 # Run ISO [group('ISO')] -run-iso image="bluefin" tag="latest" flavor="main": +run-iso image="aurora" tag="latest" flavor="main": #!/usr/bin/bash set -eoux pipefail image={{ image }} @@ -677,7 +658,7 @@ verify-container container="" registry="ghcr.io/ublue-os" key="": # Secureboot Check [group('Utility')] -secureboot image="bluefin" tag="latest" flavor="main": +secureboot image="aurora" tag="latest" flavor="main": #!/usr/bin/bash set -eoux pipefail image={{ image }} @@ -732,7 +713,7 @@ secureboot image="bluefin" tag="latest" flavor="main": # Get Fedora Version of an image [group('Utility')] [private] -fedora_version image="bluefin" tag="latest" flavor="main" $kernel_pin="": +fedora_version image="aurora" tag="latest" flavor="main" $kernel_pin="": #!/usr/bin/bash set -eou pipefail just validate {{ image }} {{ tag }} {{ flavor }} @@ -753,7 +734,7 @@ fedora_version image="bluefin" tag="latest" flavor="main" $kernel_pin="": # Image Name [group('Utility')] [private] -image_name image="bluefin" tag="latest" flavor="main": +image_name image="aurora" tag="latest" flavor="main": #!/usr/bin/bash set -eou pipefail just validate {{ image }} {{ tag }} {{ flavor }} @@ -766,7 +747,7 @@ image_name image="bluefin" tag="latest" flavor="main": # Generate Tags [group('Utility')] -generate-build-tags image="bluefin" tag="latest" flavor="main" kernel_pin="" ghcr="0" $version="" github_event="" github_number="": +generate-build-tags image="aurora" tag="latest" flavor="main" kernel_pin="" ghcr="0" $version="" github_event="" github_number="": #!/usr/bin/bash set -eou pipefail diff --git a/build_files/base/00-image-info.sh b/build_files/base/00-image-info.sh index e7adda63..2810569f 100755 --- a/build_files/base/00-image-info.sh +++ b/build_files/base/00-image-info.sh @@ -2,23 +2,17 @@ set -ouex pipefail -IMAGE_PRETTY_NAME="Bluefin" +IMAGE_PRETTY_NAME="Aurora" IMAGE_LIKE="fedora" -HOME_URL="https://projectbluefin.io" -DOCUMENTATION_URL="https://docs.projectbluefin.io" -SUPPORT_URL="https://github.com/ublue-os/bluefin/issues/" -BUG_SUPPORT_URL="https://github.com/ublue-os/bluefin/issues/" +HOME_URL="https://getaurora.dev/" +DOCUMENTATION_URL="https://docs.getaurora.dev" +SUPPORT_URL="https://github.com/ublue-os/aurora/issues/" +BUG_SUPPORT_URL="https://github.com/ublue-os/aurora/issues/" CODE_NAME="Archaeopteryx" IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME" -# Aurora -if [[ "${BASE_IMAGE_NAME}" =~ kinoite ]]; then - IMAGE_PRETTY_NAME="Aurora" - HOME_URL="https://getaurora.dev/" -fi - # Image Flavor image_flavor="main" if [[ "${IMAGE_NAME}" =~ nvidia ]]; then diff --git a/build_files/base/01-build-fix.sh b/build_files/base/01-build-fix.sh index 09c2ae0a..1511c1d5 100755 --- a/build_files/base/01-build-fix.sh +++ b/build_files/base/01-build-fix.sh @@ -17,20 +17,13 @@ for repo in "${repos[@]}"; do fi done -if grep -q "kinoite" <<<"${BASE_IMAGE_NAME}"; then - rpm-ostree override replace \ - --experimental \ - --from repo=updates \ - qt6-qtbase \ - qt6-qtbase-common \ - qt6-qtbase-mysql \ - qt6-qtbase-gui || - true -fi - rpm-ostree override replace \ --experimental \ --from repo=updates \ elfutils-libelf \ - elfutils-libs || + elfutils-libs \ + qt6-qtbase \ + qt6-qtbase-common \ + qt6-qtbase-mysql \ + qt6-qtbase-gui || true diff --git a/build_files/base/05-override-install.sh b/build_files/base/05-override-install.sh index 47f0d4fa..bf4eba52 100755 --- a/build_files/base/05-override-install.sh +++ b/build_files/base/05-override-install.sh @@ -2,14 +2,8 @@ set -eoux pipefail -# Patched shells -if [[ "${BASE_IMAGE_NAME}" =~ silverblue ]]; then - rpm-ostree override replace \ - --experimental \ - --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ - gnome-shell -elif [[ "${BASE_IMAGE_NAME}" =~ kinoite ]]; then - rpm-ostree override replace \ +# Patched shell +rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ kf6-kio-doc \ @@ -19,16 +13,6 @@ elif [[ "${BASE_IMAGE_NAME}" =~ kinoite ]]; then kf6-kio-file-widgets \ kf6-kio-core \ kf6-kio-gui -fi - -# GNOME Triple Buffering -if [[ "${BASE_IMAGE_NAME}" =~ silverblue && "${FEDORA_MAJOR_VERSION}" -lt "41" ]]; then - rpm-ostree override replace \ - --experimental \ - --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ - mutter \ - mutter-common -fi # Fix for ID in fwupd rpm-ostree override replace \ diff --git a/build_files/base/07-base-image-changes.sh b/build_files/base/07-base-image-changes.sh index 7cf450b3..8b2f5694 100755 --- a/build_files/base/07-base-image-changes.sh +++ b/build_files/base/07-base-image-changes.sh @@ -2,103 +2,43 @@ set -ouex pipefail -if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then - # Branding for flatpak manager - sed -i 's/Bluefin/Aurora/' /usr/libexec/ublue-flatpak-manager - - # Restore x11 for Nvidia Images - if [[ "${FEDORA_MAJOR_VERSION}" -eq "40" ]]; then - rpm-ostree install plasma-workspace-x11 - fi - - # Branding for Images - ln -sf ../places/distributor-logo.svg /usr/share/icons/hicolor/scalable/apps/start-here.svg - ln -sf /usr/share/wallpapers/aurora-wallpaper-1/contents/images/15392x8616.jpg /usr/share/backgrounds/default.png - ln -sf /usr/share/wallpapers/aurora-wallpaper-1/contents/images/15392x8616.jpg /usr/share/backgrounds/default-dark.png - ln -sf aurora.xml /usr/share/backgrounds/default.xml - - # Favorites in Kickoff - sed -i '//,/<\/entry>/ s/[^<]*<\/default>/preferred:\/\/browser,applications:org.gnome.Ptyxis.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml - sed -i '//,/<\/entry>/ s/[^<]*<\/default>/preferred:\/\/browser,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.gnome.Ptyxis.desktop,org.kde.discover.desktop<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml - - # Ptyxis Terminal - sed -i 's@\[Desktop Action new-window\]@\[Desktop Action new-window\]\nX-KDE-Shortcuts=Ctrl+Alt+T@g' /usr/share/applications/org.gnome.Ptyxis.desktop - sed -i 's@Exec=ptyxis@Exec=kde-ptyxis@g' /usr/share/applications/org.gnome.Ptyxis.desktop - sed -i 's@Keywords=@Keywords=konsole;console;@g' /usr/share/applications/org.gnome.Ptyxis.desktop - cp /usr/share/applications/org.gnome.Ptyxis.desktop /usr/share/kglobalaccel/org.gnome.Ptyxis.desktop - - # Rebrand to Aurora - sed -i 's@Bluefin@Aurora@g' /usr/share/applications/system-update.desktop - sed -i 's@Bluefin@Aurora@g' /usr/share/ublue-os/motd/tips/10-tips.md - sed -i 's@Bluefin@Aurora@g' /usr/libexec/ublue-flatpak-manager - - rm -f /etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in - systemctl enable kde-sysmonitor-workaround.service - - # Get Default Font since font fallback doesn't work - curl --retry 3 --output-dir /tmp -LO https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/FiraCode.zip - mkdir -p /usr/share/fonts/fira-nf - unzip /tmp/FiraCode.zip -d /usr/share/fonts/fira-nf - fc-cache -f /usr/share/fonts/fira-nf - - # Test aurora gschema override for errors. If there are no errors, proceed with compiling aurora gschema, which includes setting overrides. - mkdir -p /tmp/aurora-schema-test - find /usr/share/glib-2.0/schemas/ -type f ! -name "*.gschema.override" -exec cp {} /tmp/aurora-schema-test/ \; - cp /usr/share/glib-2.0/schemas/zz0-aurora-modifications.gschema.override /tmp/aurora-schema-test/ - echo "Running error test for aurora gschema override. Aborting if failed." - glib-compile-schemas --strict /tmp/aurora-schema-test - echo "Compiling gschema to include aurora setting overrides" - glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null - -elif [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then - - # Remove desktop entries - if [[ -f /usr/share/applications/gnome-system-monitor.desktop ]]; then - sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/gnome-system-monitor.desktop - fi - if [[ -f /usr/share/applications/org.gnome.SystemMonitor.desktop ]]; then - sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/org.gnome.SystemMonitor.desktop - fi - - # Add Mutter experimental-features - MUTTER_EXP_FEATS="'scale-monitor-framebuffer', 'xwayland-native-scaling'" - if [[ "${IMAGE_NAME}" =~ nvidia ]]; then - MUTTER_EXP_FEATS="'kms-modifiers', ${MUTTER_EXP_FEATS}" - fi - tee /usr/share/glib-2.0/schemas/zz1-bluefin-modifications-mutter-exp-feats.gschema.override << EOF -[org.gnome.mutter] -experimental-features=[${MUTTER_EXP_FEATS}] -EOF - - # GNOME Terminal is replaced with Ptyxis in F41+ - # Make schema valid on GNOME <47 which do not contain the accent-color key or xwayland-native-scaling mutter feature - if [[ "${FEDORA_MAJOR_VERSION}" -lt "41" ]]; then - sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop - sed -i 's@accent-color="slate"@@g' /usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override - sed -i 's@'", "\''xwayland-native-scaling'\''@@g' /usr/share/glib-2.0/schemas/zz1-bluefin-modifications-mutter-exp-feats.gschema.override - fi - - # Create symlinks from old to new wallpaper names for backwards compatibility - ln -s "/usr/share/backgrounds/bluefin/01-bluefin.xml" "/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml" - ln -s "/usr/share/backgrounds/bluefin/04-bluefin.xml" "/usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml" - ln -s "/usr/share/backgrounds/bluefin/08-bluefin.xml" "/usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml" - ln -s "/usr/share/backgrounds/bluefin/11-bluefin.xml" "/usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml" - ln -s "/usr/share/backgrounds/xe_clouds.jxl" "/usr/share/backgrounds/xe_clouds.jpeg" - ln -s "/usr/share/backgrounds/xe_foothills.jxl" "/usr/share/backgrounds/xe_foothills.jpeg" - ln -s "/usr/share/backgrounds/xe_space_needle.jxl" "/usr/share/backgrounds/xe_space_needle.jpeg" - ln -s "/usr/share/backgrounds/xe_sunset.jxl" "/usr/share/backgrounds/xe_sunset.jpeg" - - # Test bluefin gschema override for errors. If there are no errors, proceed with compiling bluefin gschema, which includes setting overrides. - mkdir -p /tmp/bluefin-schema-test - find /usr/share/glib-2.0/schemas/ -type f ! -name "*.gschema.override" -exec cp {} /tmp/bluefin-schema-test/ \; - cp /usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override /tmp/bluefin-schema-test/ - cp /usr/share/glib-2.0/schemas/zz1-bluefin-modifications-mutter-exp-feats.gschema.override /tmp/bluefin-schema-test/ - echo "Running error test for bluefin gschema override. Aborting if failed." - # We should ideally refactor this to handle multiple GNOME version schemas better - glib-compile-schemas --strict /tmp/bluefin-schema-test - echo "Compiling gschema to include bluefin setting overrides" - glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null +# Restore x11 for Nvidia Images +if [[ "${FEDORA_MAJOR_VERSION}" -eq "40" ]]; then + rpm-ostree install plasma-workspace-x11 fi +# Branding for Images +ln -sf ../places/distributor-logo.svg /usr/share/icons/hicolor/scalable/apps/start-here.svg +ln -sf /usr/share/wallpapers/aurora-wallpaper-1/contents/images/15392x8616.jpg /usr/share/backgrounds/default.png +ln -sf /usr/share/wallpapers/aurora-wallpaper-1/contents/images/15392x8616.jpg /usr/share/backgrounds/default-dark.png +ln -sf aurora.xml /usr/share/backgrounds/default.xml + +# Favorites in Kickoff +sed -i '//,/<\/entry>/ s/[^<]*<\/default>/preferred:\/\/browser,applications:org.gnome.Ptyxis.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml +sed -i '//,/<\/entry>/ s/[^<]*<\/default>/preferred:\/\/browser,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.gnome.Ptyxis.desktop,org.kde.discover.desktop<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml + +# Ptyxis Terminal +sed -i 's@\[Desktop Action new-window\]@\[Desktop Action new-window\]\nX-KDE-Shortcuts=Ctrl+Alt+T@g' /usr/share/applications/org.gnome.Ptyxis.desktop +sed -i 's@Exec=ptyxis@Exec=kde-ptyxis@g' /usr/share/applications/org.gnome.Ptyxis.desktop +sed -i 's@Keywords=@Keywords=konsole;console;@g' /usr/share/applications/org.gnome.Ptyxis.desktop +cp /usr/share/applications/org.gnome.Ptyxis.desktop /usr/share/kglobalaccel/org.gnome.Ptyxis.desktop + +rm -f /etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in + +# Get Default Font since font fallback doesn't work +curl --retry 3 --output-dir /tmp -LO https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/FiraCode.zip +mkdir -p /usr/share/fonts/fira-nf +unzip /tmp/FiraCode.zip -d /usr/share/fonts/fira-nf +fc-cache -f /usr/share/fonts/fira-nf + +# Test aurora gschema override for errors. If there are no errors, proceed with compiling aurora gschema, which includes setting overrides. +mkdir -p /tmp/aurora-schema-test +find /usr/share/glib-2.0/schemas/ -type f ! -name "*.gschema.override" -exec cp {} /tmp/aurora-schema-test/ \; +cp /usr/share/glib-2.0/schemas/zz0-aurora-modifications.gschema.override /tmp/aurora-schema-test/ +echo "Running error test for aurora gschema override. Aborting if failed." +glib-compile-schemas --strict /tmp/aurora-schema-test +echo "Compiling gschema to include aurora setting overrides" +glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null + # Watermark for Plymouth cp /usr/share/plymouth/themes/spinner/{"$BASE_IMAGE_NAME"-,}watermark.png diff --git a/build_files/base/17-cleanup.sh b/build_files/base/17-cleanup.sh index aa9df2cc..d935d6f4 100755 --- a/build_files/base/17-cleanup.sh +++ b/build_files/base/17-cleanup.sh @@ -16,6 +16,7 @@ systemctl enable brew-update.timer systemctl --global enable ublue-user-setup.service systemctl --global enable podman-auto-update.timer systemctl enable check-sb-key.service +systemctl enable kde-sysmonitor-workaround.service # Hide Desktop Files. Hidden removes mime associations sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/fish.desktop diff --git a/build_files/dx/09-cleanup-dx.sh b/build_files/dx/09-cleanup-dx.sh index 168e140c..8f15b473 100755 --- a/build_files/dx/09-cleanup-dx.sh +++ b/build_files/dx/09-cleanup-dx.sh @@ -6,8 +6,8 @@ systemctl enable docker.socket systemctl enable podman.socket systemctl enable swtpm-workaround.service systemctl enable libvirt-workaround.service -systemctl enable bluefin-dx-groups.service -systemctl enable --global bluefin-dx-user-vscode.service +systemctl enable aurora-dx-groups.service +systemctl enable --global aurora-dx-user-vscode.service systemctl disable pmie.service systemctl disable pmlogger.service diff --git a/build_files/shared/build-dx.sh b/build_files/shared/build-dx.sh index b095b31a..d7ac9414 100755 --- a/build_files/shared/build-dx.sh +++ b/build_files/shared/build-dx.sh @@ -28,12 +28,8 @@ sysctl -p /ctx/build_files/dx/04-override-install-dx.sh # Branding Changes -if test "$BASE_IMAGE_NAME" = "silverblue"; then - sed -i '/^PRETTY_NAME/s/Bluefin/Bluefin-dx/' /usr/lib/os-release -elif test "$BASE_IMAGE_NAME" = "kinoite"; then - sed -i '/^PRETTY_NAME/s/Aurora/Aurora-dx/' /usr/lib/os-release - sed -i 's/Aurora/Aurora-DX/' /usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc -fi +sed -i '/^PRETTY_NAME/s/Aurora/Aurora-dx/' /usr/lib/os-release +sed -i 's/Aurora/Aurora-DX/' /usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc # Systemd and Disable Repos /ctx/build_files/dx/09-cleanup-dx.sh diff --git a/packages.json b/packages.json index 3b8f9b23..69fafd91 100644 --- a/packages.json +++ b/packages.json @@ -62,27 +62,6 @@ "wl-clipboard", "zsh" ], - "silverblue": [ - "cryfs", - "gnome-shell-extension-appindicator", - "gnome-shell-extension-blur-my-shell", - "gnome-shell-extension-caffeine", - "gnome-shell-extension-dash-to-dock", - "gnome-shell-extension-gsconnect", - "gnome-shell-extension-logo-menu", - "gnome-shell-extension-search-light", - "gnome-shell-extension-tailscale-gnome-qs", - "libgda", - "libgda-sqlite", - "libratbag-ratbagd", - "nautilus-gsconnect", - "nautilus-open-any-terminal", - "openssh-askpass", - "simple-scan", - "yaru-theme", - "zenity" - - ], "kinoite": [ "kde-runtime-docs", "kdenetwork-filesharing", @@ -171,12 +150,6 @@ "podman-docker", "ublue-os-update-services" ], - "silverblue": [ - "gnome-extensions-app", - "gnome-shell-extension-background-logo", - "gnome-software-rpm-ostree", - "gnome-terminal-nautilus" - ], "kinoite": [ "krfb", "krfb-libs", @@ -190,7 +163,6 @@ "all": [ "ptyxis" ], - "silverblue": [], "dx": [ "lxd-agent", "lxd" @@ -198,7 +170,6 @@ }, "exclude": { "all": [], - "silverblue": [], "kinoite": [], "dx": [] } @@ -210,12 +181,10 @@ ], "kinoite": [ "ptyxis" - ], - "silverblue": [] + ] }, "exclude": { "all": [], - "silverblue": [], "kinoite": [ "plasma-welcome", "plasma-welcome-fedora" From f4d52e06a0a661186cee9e4054832e85839e30c3 Mon Sep 17 00:00:00 2001 From: Nisel Date: Wed, 18 Dec 2024 12:21:38 +0200 Subject: [PATCH 2/6] fix: remove bluefin from changelogs and issue template * Also remove "de" image_matrix because now only it's only kde --- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/changelogs.py | 35 ++++++--------------------- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index abdf2d61..c18a42fe 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -1,5 +1,5 @@ name: Bug Report -description: Report an issue about using Bluefin +description: Report an issue about using Aurora body: - type: markdown attributes: diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index b27333ee..040298a8 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - name: Questions and Feedback - url: https://universal-blue.discourse.group/c/bluefin/6 + url: https://universal-blue.discourse.group/c/aurora/11 about: Ask a question, share tips, and help others diff --git a/.github/changelogs.py b/.github/changelogs.py index c03f6daf..17c93781 100644 --- a/.github/changelogs.py +++ b/.github/changelogs.py @@ -10,17 +10,10 @@ IMAGE_MATRIX_LATEST = { "experience": ["base", "dx"], - "de": ["kde", "gnome"], "image_flavor": ["main", "nvidia", "hwe", "hwe-nvidia"], } -IMAGE_MATRIX_GTS = { - "experience": ["base", "dx"], - "de": ["gnome"], - "image_flavor": ["main", "nvidia"], -} IMAGE_MATRIX = { "experience": ["base", "dx"], - "de": ["kde", "gnome"], "image_flavor": ["main", "nvidia"], } @@ -39,13 +32,12 @@ "base": "### Base Images\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n", "dx": "### [Dev Experience Images](https://docs.projectbluefin.io/bluefin-dx)\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n", "kde": "### [Aurora Images](https://getaurora.dev/)\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n", - "gnome": "### [Bluefin Images](https://projectbluefin.io/)\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n", "nvidia": "### Nvidia Images\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n", "hwe": "### HWE Images\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n", } COMMITS_FORMAT = "### Commits\n| Hash | Subject |\n| --- | --- |{commits}\n\n" -COMMIT_FORMAT = "\n| **[{short}](https://github.com/ublue-os/bluefin/commit/{githash})** | {subject} |" +COMMIT_FORMAT = "\n| **[{short}](https://github.com/ublue-os/aurora/commit/{githash})** | {subject} |" CHANGELOG_TITLE = "{tag}: {pretty}" CHANGELOG_FORMAT = """\ @@ -57,7 +49,6 @@ | Name | Version | | --- | --- | | **Kernel** | {pkgrel:kernel} | -| **Gnome** | {pkgrel:gnome-control-center-filesystem} | | **KDE** | {pkgrel:plasma-desktop} | | **Mesa** | {pkgrel:mesa-filesystem} | | **Podman** | {pkgrel:podman} | @@ -94,7 +85,6 @@ BLACKLIST_VERSIONS = [ "kernel", - "gnome-control-center-filesystem", "plasma-desktop", "mesa-filesystem", "podman", @@ -108,18 +98,11 @@ def get_images(target: str): if "latest" in target: matrix = IMAGE_MATRIX_LATEST - elif "gts" in target: - matrix = IMAGE_MATRIX_GTS else: matrix = IMAGE_MATRIX - for experience, de, image_flavor in product(*matrix.values()): - img = "" - if de == "gnome": - img += "bluefin" - elif de == "kde": - img += "aurora" - + for experience, image_flavor in product(*matrix.values()): + img = "aurora" if experience == "dx": img += "-dx" @@ -127,13 +110,13 @@ def get_images(target: str): img += "-" img += image_flavor - yield img, experience, de, image_flavor + yield img, experience, image_flavor def get_manifests(target: str): out = {} imgs = list(get_images(target)) - for j, (img, _, _, _) in enumerate(imgs): + for j, (img, _, _) in enumerate(imgs): output = None print(f"Getting {img}:{target} manifest ({j+1}/{len(imgs)}).") for i in range(RETRIES): @@ -205,7 +188,7 @@ def get_package_groups(target: str, prev: dict[str, Any], manifests: dict[str, A # Find common packages first = True - for img, experience, de, image_flavor in get_images(target): + for img, experience, image_flavor in get_images(target): if img not in pkg: continue @@ -222,7 +205,7 @@ def get_package_groups(target: str, prev: dict[str, Any], manifests: dict[str, A # Find other packages for t, other in others.items(): first = True - for img, experience, de, image_flavor in get_images(target): + for img, experience, image_flavor in get_images(target): if img not in pkg: continue @@ -230,10 +213,6 @@ def get_package_groups(target: str, prev: dict[str, Any], manifests: dict[str, A continue if t == "nvidia" and "nvidia" not in image_flavor: continue - if t == "kde" and de != "kde": - continue - if t == "gnome" and de != "gnome": - continue if t == "base" and experience != "base": continue if t == "dx" and experience != "dx": From ab18214ed5baa15c3e26be044fe5d82e69f23571 Mon Sep 17 00:00:00 2001 From: Nisel Date: Wed, 18 Dec 2024 12:23:28 +0200 Subject: [PATCH 3/6] chore: remove some bluefin mentions --- .github/workflows/build-iso-latest.yml | 2 +- Containerfile | 14 +++++++------- boot_menu.yml | 14 -------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-iso-latest.yml b/.github/workflows/build-iso-latest.yml index 99b6155a..d5b89c0a 100644 --- a/.github/workflows/build-iso-latest.yml +++ b/.github/workflows/build-iso-latest.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - brand_name: ${{ fromJson(inputs.brand_name || '["bluefin", "aurora"]') }} + brand_name: ${{ fromJson(inputs.brand_name || '["aurora"]') }} with: image_flavors: '["main", "nvidia", "hwe", "hwe-nvidia"]' brand_name: ${{ matrix.brand_name }} diff --git a/Containerfile b/Containerfile index 2f525721..51afbed6 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE_NAME="silverblue" +ARG BASE_IMAGE_NAME="kinoite" ARG FEDORA_MAJOR_VERSION="40" ARG SOURCE_IMAGE="${BASE_IMAGE_NAME}-main" ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" @@ -6,13 +6,13 @@ ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" FROM scratch AS ctx COPY / / -## bluefin image section +## aurora image section FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS base ARG AKMODS_FLAVOR="coreos-stable" -ARG BASE_IMAGE_NAME="silverblue" +ARG BASE_IMAGE_NAME="kinoite" ARG FEDORA_MAJOR_VERSION="40" -ARG IMAGE_NAME="bluefin" +ARG IMAGE_NAME="aurora" ARG IMAGE_VENDOR="ublue-os" ARG KERNEL="6.10.10-200.fc40.x86_64" ARG SHA_HEAD_SHORT="dedbeef" @@ -23,13 +23,13 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --mount=type=bind,from=ctx,source=/,target=/ctx \ /ctx/build_files/shared/build-base.sh -## bluefin-dx developer edition image section +## aurora-dx developer edition image section FROM base AS dx ARG AKMODS_FLAVOR="coreos-stable" -ARG BASE_IMAGE_NAME="silverblue" +ARG BASE_IMAGE_NAME="kinoite" ARG FEDORA_MAJOR_VERSION="40" -ARG IMAGE_NAME="bluefin-dx" +ARG IMAGE_NAME="aurora-dx" ARG IMAGE_VENDOR="ublue-os" ARG KERNEL="6.10.10-200.fc40.x86_64" ARG SHA_HEAD_SHORT="dedbeef" diff --git a/boot_menu.yml b/boot_menu.yml index 3d0a267f..4f341a09 100644 --- a/boot_menu.yml +++ b/boot_menu.yml @@ -1,18 +1,4 @@ ublue_variants: - - label: ublue-os/bluefin - ks: /kickstart/ublue-os.ks - flavors: - - label: bluefin - info: Bluefin - - label: ublue-os/bluefin-nvidia - ks: /kickstart/ublue-os-nvidia.ks - subvariants: - - label: latest driver - - label: 470xx driver - suffix: -470 - flavors: - - label: bluefin-nvidia - info: Bluefin - label: ublue-os/aurora ks: /kickstart/ublue-os.ks flavors: From ac1a17f0752e249d5b46ab8ab7e3d913a8379e77 Mon Sep 17 00:00:00 2001 From: Nisel Date: Wed, 18 Dec 2024 12:26:06 +0200 Subject: [PATCH 4/6] chore: rename files and text from bluefin to aurora * Thanks https://github.com/inffy for PR with bluefin-cli --> aurora-cli changes --- just/{bluefin-apps.just => aurora-apps.just} | 4 +- ...bluefin-system.just => aurora-system.just} | 42 ++++--------------- ...in-profile.sh => vscode-aurora-profile.sh} | 0 .../bin/{bluefinbox-enter => aurorabox-enter} | 0 ...roups.service => aurora-dx-groups.service} | 2 +- ....service => aurora-dx-user-vscode.service} | 2 +- .../{bluefin-dx-groups => aurora-dx-groups} | 0 ...n-dx-kvmfr-setup => aurora-dx-kvmfr-setup} | 4 +- ...n-dx-user-vscode => aurora-dx-user-vscode} | 2 +- .../libexec/{bluefin-incus => aurora-incus} | 2 +- .../ublue-os/motd/{bluefin.md => aurora.md} | 8 ++-- .../shared/usr/libexec/ublue-bling.sh | 22 +++++----- .../shared/usr/libexec/ublue-flatpak-manager | 4 +- system_files/shared/usr/libexec/ublue-motd | 2 +- .../usr/share/applications/Discourse.desktop | 2 +- .../share/applications/system-update.desktop | 2 +- .../{bluefin-cli => aurora-cli}/bling.fish | 0 .../{bluefin-cli => aurora-cli}/bling.sh | 0 ...-bluefin-global.js => 01-aurora-global.js} | 2 +- ...uefin-cli.Brewfile => aurora-cli.Brewfile} | 0 .../usr/share/ublue-os/motd/tips/10-tips.md | 4 +- 21 files changed, 40 insertions(+), 64 deletions(-) rename just/{bluefin-apps.just => aurora-apps.just} (99%) rename just/{bluefin-system.just => aurora-system.just} (87%) rename system_files/dx/etc/profile.d/{vscode-bluefin-profile.sh => vscode-aurora-profile.sh} (100%) rename system_files/dx/usr/bin/{bluefinbox-enter => aurorabox-enter} (100%) rename system_files/dx/usr/lib/systemd/system/{bluefin-dx-groups.service => aurora-dx-groups.service} (82%) rename system_files/dx/usr/lib/systemd/user/{bluefin-dx-user-vscode.service => aurora-dx-user-vscode.service} (82%) rename system_files/dx/usr/libexec/{bluefin-dx-groups => aurora-dx-groups} (100%) rename system_files/dx/usr/libexec/{bluefin-dx-kvmfr-setup => aurora-dx-kvmfr-setup} (96%) rename system_files/dx/usr/libexec/{bluefin-dx-user-vscode => aurora-dx-user-vscode} (94%) rename system_files/dx/usr/libexec/{bluefin-incus => aurora-incus} (97%) rename system_files/kinoite/usr/share/ublue-os/motd/{bluefin.md => aurora.md} (57%) rename system_files/shared/usr/share/ublue-os/{bluefin-cli => aurora-cli}/bling.fish (100%) rename system_files/shared/usr/share/ublue-os/{bluefin-cli => aurora-cli}/bling.sh (100%) rename system_files/shared/usr/share/ublue-os/firefox-config/{01-bluefin-global.js => 01-aurora-global.js} (80%) rename system_files/shared/usr/share/ublue-os/homebrew/{bluefin-cli.Brewfile => aurora-cli.Brewfile} (100%) diff --git a/just/bluefin-apps.just b/just/aurora-apps.just similarity index 99% rename from just/bluefin-apps.just rename to just/aurora-apps.just index 52981e27..21b2e061 100644 --- a/just/bluefin-apps.just +++ b/just/aurora-apps.just @@ -1,6 +1,6 @@ # vim: set ft=make : ######################## -### bluefin-apps.just +### aurora-apps.just ######################## ## Standardized verbs # configure- = configure something that is pre-installed on the image @@ -116,7 +116,7 @@ install-incus: exit fi echo 'Installing and configuring Incus.' - /usr/libexec/bluefin-incus + /usr/libexec/aurora-incus # Install Kubernetes CLI dev tools [group('Apps')] diff --git a/just/bluefin-system.just b/just/aurora-system.just similarity index 87% rename from just/bluefin-system.just rename to just/aurora-system.just index ecafba01..5091cb79 100644 --- a/just/bluefin-system.just +++ b/just/aurora-system.just @@ -1,6 +1,6 @@ # vim: set ft=make : ######################## -### bluefin-system.just +### aurora-system.just ######################## ## Standardized verbs # configure- = configure something that is pre-installed on the image @@ -16,16 +16,16 @@ benchmark: @echo 'Running a 1 minute benchmark ...' stress-ng --matrix 0 -t 1m --times -# Configure Bluefin-CLI Terminal Experience with Brew +# Configure Aurora-CLI Terminal Experience with Brew [group('System')] -bluefin-cli: +aurora-cli: @/usr/libexec/ublue-bling.sh # alias for toggle-devmode devmode: @ujust toggle-devmode -# Toggle between Bluefin and the Developer Experience +# Toggle between Aurora and the Developer Experience [group('System')] toggle-devmode: #!/usr/bin/env bash @@ -33,7 +33,7 @@ toggle-devmode: CURRENT_IMAGE=$(rpm-ostree status -b --json | jq -r '.deployments[0]."container-image-reference"') if grep -q "/var/ublue-os/image" <<< $CURRENT_IMAGE ; then cat <> "${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish" ### bling.fish source start -test -f /usr/share/ublue-os/bluefin-cli/bling.fish && source /usr/share/ublue-os/bluefin-cli/bling.fish +test -f /usr/share/ublue-os/aurora-cli/bling.fish && source /usr/share/ublue-os/aurora-cli/bling.fish ### bling.fish source end EOF elif [[ "${shell}" == "zsh" ]]; then echo 'Adding bling to your .zshrc 💤💤💤' cat<<-EOF >> "${ZDOTDIR:-$HOME}/.zshrc" ### bling.sh source start -test -f /usr/share/ublue-os/bluefin-cli/bling.sh && source /usr/share/ublue-os/bluefin-cli/bling.sh +test -f /usr/share/ublue-os/aurora-cli/bling.sh && source /usr/share/ublue-os/aurora-cli/bling.sh ### bling.sh source end EOF elif [[ "${shell}" == "bash" ]]; then echo 'Adding bling to your .bashrc 💥💥💥' cat<<-EOF >> "${HOME}/.bashrc" ### bling.sh source start -test -f /usr/share/ublue-os/bluefin-cli/bling.sh && source /usr/share/ublue-os/bluefin-cli/bling.sh +test -f /usr/share/ublue-os/aurora-cli/bling.sh && source /usr/share/ublue-os/aurora-cli/bling.sh ### bling.sh source end EOF else @@ -98,7 +98,7 @@ if [[ "${shell}" == "fish" ]]; then sed -i '/### bling.fish source start/,/### bling.fish source end/d' \ "${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish" \ || \ - line=$(grep -n "source /usr/share/ublue-os/bluefin-cli/bling.fish" \ + line=$(grep -n "source /usr/share/ublue-os/aurora-cli/bling.fish" \ "${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish" \ | grep -Eo '^[^:]+') && sed -i "${line}"d \ "${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish" @@ -106,7 +106,7 @@ elif [[ "${shell}" == "zsh" ]]; then sed -i '/### bling.sh source start/,/### bling.sh source end/d' \ "${ZDOTDIR:-$HOME}/.zshrc" \ || \ - line=$(grep -n "source /usr/share/ublue-os/bluefin-cli/bling.sh" \ + line=$(grep -n "source /usr/share/ublue-os/aurora-cli/bling.sh" \ "${ZDOTDIR:-$HOME}/.zshrc" \ | grep -Eo '^[^:]+') && sed -i "${line}"d \ "${ZDOTDIR:-$HOME}/.zshrc" @@ -114,7 +114,7 @@ elif [[ "${shell}" == "bash" ]]; then sed -i '/### bling.sh source start/,/### bling.sh source end/d' \ "${HOME}/.bashrc" \ || \ - line=$(grep -n "source /usr/share/ublue-os/bluefin-cli/bling.sh" \ + line=$(grep -n "source /usr/share/ublue-os/aurora-cli/bling.sh" \ "${HOME}/.bashrc" \ | grep -Eo '^[^:]+') && sed -i "${line}"d \ "${HOME}/.bashrc" diff --git a/system_files/shared/usr/libexec/ublue-flatpak-manager b/system_files/shared/usr/libexec/ublue-flatpak-manager index 4f9800b0..8135663b 100755 --- a/system_files/shared/usr/libexec/ublue-flatpak-manager +++ b/system_files/shared/usr/libexec/ublue-flatpak-manager @@ -15,12 +15,12 @@ fi # Set up Firefox default configuration mkdir -p /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable/defaults/pref -rm -f /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable/defaults/pref/*bluefin*.js +rm -f /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable/defaults/pref/*aurora*.js /usr/bin/cp -rf /usr/share/ublue-os/firefox-config/* /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable/defaults/pref/ # Use until yafti rework is done flatpak --system update -y -notify-send "Welcome to Bluefin" "Your computer is ready!" --app-name="Flatpak Manager Service" -u NORMAL +notify-send "Welcome to Aurora" "Your computer is ready!" --app-name="Flatpak Manager Service" -u NORMAL echo $VER >"$VER_FILE" diff --git a/system_files/shared/usr/libexec/ublue-motd b/system_files/shared/usr/libexec/ublue-motd index 0e9589e4..037c093c 100755 --- a/system_files/shared/usr/libexec/ublue-motd +++ b/system_files/shared/usr/libexec/ublue-motd @@ -38,4 +38,4 @@ sed -e "s/%IMAGE_NAME%/$IMAGE_NAME_ESCAPED/g" \ -e "s/%IMAGE_TAG%/$IMAGE_TAG_ESCAPED/g" \ -e "s/%TIP%/$TIP_ESCAPED/g" \ -e "s/%KEY_WARN%/$KEY_WARN_ESCAPED/g" \ - /usr/share/ublue-os/motd/bluefin.md | tr '~' '\n' | /usr/bin/glow -s /usr/share/ublue-os/motd/themes/$THEME.json -w 78 - + /usr/share/ublue-os/motd/aurora.md | tr '~' '\n' | /usr/bin/glow -s /usr/share/ublue-os/motd/themes/$THEME.json -w 78 - diff --git a/system_files/shared/usr/share/applications/Discourse.desktop b/system_files/shared/usr/share/applications/Discourse.desktop index a5b21bf8..5c58ee12 100644 --- a/system_files/shared/usr/share/applications/Discourse.desktop +++ b/system_files/shared/usr/share/applications/Discourse.desktop @@ -2,7 +2,7 @@ Type=Application NoDisplay=false Terminal=false -Exec=xdg-open https://universal-blue.discourse.group/c/bluefin/ +Exec=xdg-open https://universal-blue.discourse.group/c/aurora/ Icon=ublue-discourse Name=Community Comment=Universal Blue Forums diff --git a/system_files/shared/usr/share/applications/system-update.desktop b/system_files/shared/usr/share/applications/system-update.desktop index 7971f9b4..3c2ef143 100644 --- a/system_files/shared/usr/share/applications/system-update.desktop +++ b/system_files/shared/usr/share/applications/system-update.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=System Update -Comment=Update Bluefin, Flatpaks, Distrobox containers, and more +Comment=Update Aurora, Flatpaks, Distrobox containers, and more Icon=ublue-update Categories=ConsoleOnly;System; Terminal=true diff --git a/system_files/shared/usr/share/ublue-os/bluefin-cli/bling.fish b/system_files/shared/usr/share/ublue-os/aurora-cli/bling.fish similarity index 100% rename from system_files/shared/usr/share/ublue-os/bluefin-cli/bling.fish rename to system_files/shared/usr/share/ublue-os/aurora-cli/bling.fish diff --git a/system_files/shared/usr/share/ublue-os/bluefin-cli/bling.sh b/system_files/shared/usr/share/ublue-os/aurora-cli/bling.sh similarity index 100% rename from system_files/shared/usr/share/ublue-os/bluefin-cli/bling.sh rename to system_files/shared/usr/share/ublue-os/aurora-cli/bling.sh diff --git a/system_files/shared/usr/share/ublue-os/firefox-config/01-bluefin-global.js b/system_files/shared/usr/share/ublue-os/firefox-config/01-aurora-global.js similarity index 80% rename from system_files/shared/usr/share/ublue-os/firefox-config/01-bluefin-global.js rename to system_files/shared/usr/share/ublue-os/firefox-config/01-aurora-global.js index d5d6b6b4..62711150 100644 --- a/system_files/shared/usr/share/ublue-os/firefox-config/01-bluefin-global.js +++ b/system_files/shared/usr/share/ublue-os/firefox-config/01-aurora-global.js @@ -1,3 +1,3 @@ -// Bluefin Global +// Aurora Global pref("gfx.webrender.all", true); pref("media.ffmpeg.vaapi.enabled", true); diff --git a/system_files/shared/usr/share/ublue-os/homebrew/bluefin-cli.Brewfile b/system_files/shared/usr/share/ublue-os/homebrew/aurora-cli.Brewfile similarity index 100% rename from system_files/shared/usr/share/ublue-os/homebrew/bluefin-cli.Brewfile rename to system_files/shared/usr/share/ublue-os/homebrew/aurora-cli.Brewfile diff --git a/system_files/shared/usr/share/ublue-os/motd/tips/10-tips.md b/system_files/shared/usr/share/ublue-os/motd/tips/10-tips.md index 97d95152..9631132c 100644 --- a/system_files/shared/usr/share/ublue-os/motd/tips/10-tips.md +++ b/system_files/shared/usr/share/ublue-os/motd/tips/10-tips.md @@ -12,5 +12,5 @@ Tailscale is included, check out [their docs](https://tailscale.com/kb/1017/inst `tldr vim` will give you the basic rundown on commands for a given tool `ujust rebase-helper` can help you roll back to a specific image, or to a different channel entirely, check the docs for more info `ujust changelogs` shows a summary of the package changes since the last update -Don't forget to check the [release notes](https://github.com/ublue-os/bluefin/releases) -Help keep Bluefin alive and healthy, consider [donating](https://docs.projectbluefin.io/donations) +Don't forget to check the [release notes](https://github.com/ublue-os/aurora/releases) +Help keep Aurora alive and healthy, consider [donating](https://docs.projectbluefin.io/donations) From b95c99c7b1b3b19641b7c04ef75f4d73f26e7ef7 Mon Sep 17 00:00:00 2001 From: Nisel Date: Wed, 18 Dec 2024 12:29:32 +0200 Subject: [PATCH 5/6] chore: always use /usr/bin/ksshaskpass as SUDO_ASKPASS --- system_files/shared/etc/profile.d/askpass.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/system_files/shared/etc/profile.d/askpass.sh b/system_files/shared/etc/profile.d/askpass.sh index 51a846ea..941f7191 100644 --- a/system_files/shared/etc/profile.d/askpass.sh +++ b/system_files/shared/etc/profile.d/askpass.sh @@ -1,11 +1,4 @@ #!/usr/bin/bash -IMAGE_INFO="/usr/share/ublue-os/image-info.json" -BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO) - -if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then - SUDO_ASKPASS='/usr/bin/ksshaskpass' -elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass' -fi +SUDO_ASKPASS='/usr/bin/ksshaskpass' export SUDO_ASKPASS From 2c6014f578208e3e98466099abed2b3022c5bb8c Mon Sep 17 00:00:00 2001 From: Nisel Date: Thu, 19 Dec 2024 00:22:36 +0200 Subject: [PATCH 6/6] fix: remove bluefin from README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 293ba065..4eadb6a2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Codacy Badge](https://app.codacy.com/project/badge/Grade/2503a44c1105456483517f793af75ee7)](https://app.codacy.com/gh/ublue-os/bluefin/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) -[![GTS Images](https://github.com/ublue-os/bluefin/actions/workflows/build-image-gts.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-gts.yml)[![Stable Images](https://github.com/ublue-os/bluefin/actions/workflows/build-image-stable.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-stable.yml)[![Latest Images](https://github.com/ublue-os/bluefin/actions/workflows/build-image-latest.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-latest.yml)[![Beta Images](https://github.com/ublue-os/bluefin/actions/workflows/build-image-beta.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-beta.yml) +[![Stable Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-stable.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-stable.yml)[![Latest Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest.yml)[![Beta Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-beta.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-beta.yml) ![aurora](https://github.com/user-attachments/assets/5d16c9fd-cdfa-49a0-bc03-b28026f8c6df) @@ -15,8 +15,8 @@ Aurora is a delightful KDE desktop experience for end-users that are looking for ## Documentation -1. [Discussions and Announcements](https://universal-blue.discourse.group/c/bluefin/6) - strongly recommended! -2. [Documentation](https://docs.projectbluefin.io/) +1. [Discussions and Announcements](https://universal-blue.discourse.group/c/aurora/11) - strongly recommended! +2. [Documentation](https://docs.getaurora.dev/) 3. [Contributing Guide](https://docs.projectbluefin.io/contributing) ### Secure Boot @@ -46,7 +46,7 @@ sudo mokutil --import public_key.der ## Star History - +