diff --git a/.github/workflows/build-image-gts.yml b/.github/workflows/build-image-gts.yml index 93d48246762..97809c0ff25 100644 --- a/.github/workflows/build-image-gts.yml +++ b/.github/workflows/build-image-gts.yml @@ -21,7 +21,7 @@ jobs: matrix: brand_name: [bluefin] with: - kernel_pin: 6.11.8-200.fc40.x86_64 ## This is where kernels get pinned. + kernel_pin: 6.11.11-200.fc40.x86_64 ## This is where kernels get pinned. brand_name: ${{ matrix.brand_name }} stream_name: gts diff --git a/.github/workflows/build-image-stable.yml b/.github/workflows/build-image-stable.yml index 3e112ea9a37..0afe9618723 100644 --- a/.github/workflows/build-image-stable.yml +++ b/.github/workflows/build-image-stable.yml @@ -23,7 +23,7 @@ jobs: matrix: brand_name: ["bluefin"] with: - kernel_pin: 6.11.8-300.fc41.x86_64 ## This is where kernels get pinned. + kernel_pin: 6.11.11-300.fc41.x86_64 ## This is where kernels get pinned. brand_name: ${{ matrix.brand_name }} stream_name: stable diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 2df2e538030..dc7e6fc17fa 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -14,7 +14,7 @@ jobs: packages: write steps: - name: Delete Images Older Than 90 Days - uses: dataaxiom/ghcr-cleanup-action@2d58aab3d24aed94070e032d3091b83d50d93534 # v1.0.15 + uses: dataaxiom/ghcr-cleanup-action@cd0cdb900b5dbf3a6f2cc869f0dbb0b8211f50c4 # v1.0.16 with: token: ${{ secrets.GITHUB_TOKEN }} packages: bluefin,bluefin-asus-nvidia,bluefin-dx,bluefin-dx-asus-nvidia,bluefin-dx-hwe,bluefin-dx-hwe-nvidia,bluefin-dx-nvidia,bluefin-hwe,bluefin-nvidia diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml index 6904e01d84c..41a8e3520fa 100644 --- a/.github/workflows/reusable-build-iso.yml +++ b/.github/workflows/reusable-build-iso.yml @@ -71,7 +71,7 @@ jobs: - name: Upload ISOs and Checksum to Job Artifacts if: github.ref_name == 'testing' - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4 with: name: ${{ env.ISO_NAME }} path: ${{ steps.upload-directory.outputs.iso-upload-dir }} diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 87d154efe1c..8fe2b582185 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -155,7 +155,7 @@ jobs: - name: Push to GHCR id: push if: github.event_name != 'pull_request' - uses: Wandalen/wretry.action@ffdd254f4eaf1562b8a2c66aeaa37f1ff2231179 # v3.7.3 + uses: Wandalen/wretry.action@e68c23e6309f2871ca8ae4763e7629b9c258e1ea # v3.8.0 with: attempt_limit: 3 attempt_delay: 15000 @@ -216,7 +216,7 @@ jobs: - name: Upload artifact if: github.event_name != 'pull_request' - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4 with: name: image-${{ env.IMAGE_NAME }}-${{ matrix.stream_name }} retention-days: 1 diff --git a/.github/workflows/reusable-image-scan.yml b/.github/workflows/reusable-image-scan.yml index 70abb9e026e..d0405ba7878 100644 --- a/.github/workflows/reusable-image-scan.yml +++ b/.github/workflows/reusable-image-scan.yml @@ -71,7 +71,7 @@ jobs: echo "name=$(echo ${IMAGE} | awk -F'/' '{print $NF}' | sed 's/:/-/g')" >> $GITHUB_OUTPUT - name: Upload scan results - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4 with: name: security-${{ steps.artifact-name.outputs.name }} if-no-files-found: error diff --git a/build_files/base/05-override-install.sh b/build_files/base/05-override-install.sh index 2ba223664ac..97aa5a6bc40 100755 --- a/build_files/base/05-override-install.sh +++ b/build_files/base/05-override-install.sh @@ -49,6 +49,13 @@ pip install --prefix=/usr topgrade # Install ublue-update -- breaks with packages.json due to missing topgrade rpm-ostree install ublue-update +# Required for bluefin faces to work without conflicting with a ton of packages +rm -f /usr/share/pixmaps/faces/* || echo "Expected directory deletion to fail" +mv /usr/share/pixmaps/faces/bluefin/* /usr/share/pixmaps/faces +rm -rf /usr/share/pixmaps/faces/bluefin + +rpm-ostree override remove fedora-logos --install=bluefin-logos + # Consolidate Just Files find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just diff --git a/build_files/base/09-hwe-additions.sh b/build_files/base/09-hwe-additions.sh index 17d76df64c8..f10ddab6a86 100755 --- a/build_files/base/09-hwe-additions.sh +++ b/build_files/base/09-hwe-additions.sh @@ -42,24 +42,9 @@ rpm-ostree install \ "${SURFACE_PACKAGES[@]}" tee /usr/lib/modules-load.d/ublue-surface.conf << EOF -# Add modules necessary for Disk Encryption via keyboard -surface_aggregator -surface_aggregator_registry -surface_aggregator_hub -surface_hid_core -8250_dw - -# Surface Laptop 3/Surface Book 3 and later -surface_hid -surface_kbd - # Only on AMD models pinctrl_amd -# Only on Intel models -intel_lpss -intel_lpss_pci - # Surface Book 2 pinctrl_sunrisepoint @@ -74,6 +59,21 @@ pinctrl_alderlake # For Surface Pro 10/Surface Laptop 6 pinctrl_meteorlake + +# Only on Intel models +intel_lpss +intel_lpss_pci + +# Add modules necessary for Disk Encryption via keyboard +surface_aggregator +surface_aggregator_registry +surface_aggregator_hub +surface_hid_core +8250_dw + +# Surface Laptop 3/Surface Book 3 and later +surface_hid +surface_kbd EOF echo "::endgroup::" diff --git a/build_files/base/18-workarounds.sh b/build_files/base/18-workarounds.sh index 21eaeb840db..9e7fd3f4c9e 100755 --- a/build_files/base/18-workarounds.sh +++ b/build_files/base/18-workarounds.sh @@ -19,11 +19,4 @@ fi # rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2024-dd2e9fb225 #fi -# Ping sssd version -# See Issue: https://github.com/ublue-os/bluefin/issues/2118 -if [ "$FEDORA_MAJOR_VERSION" -eq "41" ]; then - rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2024-bfd5344277 -fi - - echo "::endgroup::" diff --git a/just/bluefin-system.just b/just/bluefin-system.just index 6472c7ced46..8bad5ce1b6d 100644 --- a/just/bluefin-system.just +++ b/just/bluefin-system.just @@ -146,8 +146,8 @@ configure-vfio ACTION="": This is only used for GPU passthrough of a secondary dGPU. It will enable vfio and configure kvmfr for use with $(Urllink "https://looking-glass.io" "Looking Glass") If you do not plan to use any of this then press ESC. - EOF ${bold}NOTE:${normal} Since this is a niche use case, support will be ${b}very limited${n} + EOF OPTION=$(Choose \ "Enable VFIO drivers" \ "Disable VFIO drivers" \ @@ -156,32 +156,31 @@ configure-vfio ACTION="": fi if [[ "${OPTION,,}" =~ (^enable[[:space:]]vfio|vfio-on) ]]; then echo "Enabling VFIO..." - VIRT_TEST=$(rpm-ostree kargs) CPU_VENDOR=$(grep "vendor_id" "/proc/cpuinfo" | uniq | awk -F": " '{ print $2 }') VENDOR_KARG="unset" - if [[ ${VIRT_TEST} == *kvm.report_ignored_msrs* ]]; then - echo 'add_drivers+=" vfio vfio_iommu_type1 vfio-pci "' | sudo tee /etc/dracut.conf.d/vfio.conf - rpm-ostree initramfs --enable - if [[ ${CPU_VENDOR} == "AuthenticAMD" ]]; then - VENDOR_KARG="amd_iommu=on" - elif [[ ${CPU_VENDOR} == "GenuineIntel" ]]; then - VENDOR_KARG="intel_iommu=on" - fi - if [[ ${VENDOR_KARG} == "unset" ]]; then - echo "Failed to get CPU vendor, exiting..." - exit 1 - else - rpm-ostree kargs \ - --append-if-missing="${VENDOR_KARG}" \ - --append-if-missing="iommu=pt" \ - --append-if-missing="rd.driver.pre=vfio_pci" \ - --append-if-missing="vfio_pci.disable_vga=1" - echo "VFIO will be enabled on next boot, make sure you enable IOMMU, VT-d or AMD-v in your BIOS!" - echo "Please understand that since this is such a niche use case, support will be very limited!" - echo "To add your unused/second GPU device ids to the vfio driver by running" - echo 'rpm-ostree kargs --append-if-missing="vfio-pci.ids=xxxx:yyyy,xxxx:yyzz"' - echo "NOTE: Your second GPU will not be usable by the host after you do this!" - fi + echo 'add_drivers+=" vfio vfio_iommu_type1 vfio-pci "' | sudo tee /etc/dracut.conf.d/vfio.conf + rpm-ostree initramfs --enable + if [[ ${CPU_VENDOR} == "AuthenticAMD" ]]; then + VENDOR_KARG="amd_iommu=on" + elif [[ ${CPU_VENDOR} == "GenuineIntel" ]]; then + VENDOR_KARG="intel_iommu=on" + fi + if [[ ${VENDOR_KARG} == "unset" ]]; then + echo "Failed to get CPU vendor, exiting..." + exit 1 + else + rpm-ostree kargs \ + --append-if-missing="${VENDOR_KARG}" \ + --append-if-missing="iommu=pt" \ + --append-if-missing="rd.driver.pre=vfio_pci" \ + --append-if-missing="vfio_pci.disable_vga=1" \ + --append-if-missing="kvm.ignore_msrs=1" \ + --append-if-missing="kvm.report_ignored_msrs=0" + echo "VFIO will be enabled on next boot, make sure you enable IOMMU, VT-d or AMD-v in your BIOS!" + echo "Please understand that since this is such a niche use case, support will be very limited!" + echo "To add your unused/second GPU device ids to the vfio driver by running" + echo 'rpm-ostree kargs --append-if-missing="vfio-pci.ids=xxxx:yyyy,xxxx:yyzz"' + echo "NOTE: Your second GPU will not be usable by the host after you do this!" fi elif [[ "${OPTION,,}" =~ (^disable[[:space:]]vfio|vfio-off) ]]; then echo "" diff --git a/packages.json b/packages.json index 9e05500c29e..326e3a4f596 100644 --- a/packages.json +++ b/packages.json @@ -10,6 +10,7 @@ "bootc", "bluefin-cli-logos", "bluefin-fastfetch", + "bluefin-faces", "ddcutil", "evtest", "epson-inkjet-printer-escpr", @@ -58,6 +59,7 @@ "tailscale", "tmux", "ublue-fastfetch", + "ublue-motd", "usbmuxd", "wireguard-tools", "xprop", diff --git a/system_files/shared/usr/libexec/ublue-motd b/system_files/shared/usr/libexec/ublue-motd deleted file mode 100755 index 106143decab..00000000000 --- a/system_files/shared/usr/libexec/ublue-motd +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/bash -escape() { - sed 's/[&/\]/\\&/g' <<< "$1" -} - -TIP_FILE=$(find /usr/share/ublue-os/motd/tips/*.md | shuf -n 1) -if [[ -f "$TIP_FILE" ]]; then - IMAGE_INFO="/usr/share/ublue-os/image-info.json" - IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) - IMAGE_NAME_ESCAPED=$(escape "$IMAGE_NAME") - IMAGE_TAG=$(jq -r '."image-tag"' < $IMAGE_INFO) - IMAGE_TAG_ESCAPED=$(escape "$IMAGE_TAG") - TIP="󰋼 $(shuf -n 1 "$TIP_FILE")" - - IMAGE_DATE=$(rpm-ostree status --booted | sed -n 's/.*Timestamp: \(.*\)/\1/p') - IMAGE_DATE_SECONDS=$(date -d "$IMAGE_DATE" +%s) - CURRENT_SECONDS=$(date +%s) - DIFFERENCE=$((CURRENT_SECONDS - IMAGE_DATE_SECONDS)) - MONTH=$((30 * 24 * 60 * 60)) - if [ "$DIFFERENCE" -ge "$MONTH" ]; then - #shellcheck disable=2016 - TIP='# 󰇻 Your current image is over 1 month old, run `ujust update`' - fi - - TIP_ESCAPED=$(escape "$TIP") - -fi - -KEY_WARN_FILE="/run/user-motd-sbkey-warn.md" -[ -e $KEY_WARN_FILE ] && KEY_WARN="**WARNING**: $(cat $KEY_WARN_FILE)" -KEY_WARN_ESCAPED=$(escape "$KEY_WARN") - -THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || echo "'slate'") -THEME=${THEME//\'/} -THEME=${MOTD_FORCE_THEME:-$THEME} - -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 - diff --git a/system_files/shared/usr/libexec/ublue-system-setup b/system_files/shared/usr/libexec/ublue-system-setup index 9bee40a2181..38eeacd3c4e 100755 --- a/system_files/shared/usr/libexec/ublue-system-setup +++ b/system_files/shared/usr/libexec/ublue-system-setup @@ -9,7 +9,7 @@ VEN_ID="$(cat /sys/devices/virtual/dmi/id/chassis_vendor)" CPU_VENDOR=$(grep "vendor_id" "/proc/cpuinfo" | uniq | awk -F": " '{ print $2 }') # SCRIPT VERSION -HWS_VER=3 +HWS_VER=4 HWS_VER_FILE="/etc/ublue/hws_version" [[ -f "$HWS_VER_FILE" ]] && HWS_VER_RAN=$(cat $HWS_VER_FILE) @@ -63,9 +63,11 @@ else echo "No karg changes needed" fi +SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)" + # FRAMEWORK 13 AMD FIXES if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then - if [[ $SYS_ID == "Laptop ("* ]]; then + if [[ $SYS_ID == "Laptop 13 ("* ]]; then if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; then if [[ ! -f /etc/modprobe.d/alsa.conf ]]; then echo 'Fixing 3.5mm jack' diff --git a/system_files/shared/usr/share/fish/vendor_functions.d/fish_greeting.fish b/system_files/shared/usr/share/fish/vendor_functions.d/fish_greeting.fish deleted file mode 100644 index bdc2ba25c83..00000000000 --- a/system_files/shared/usr/share/fish/vendor_functions.d/fish_greeting.fish +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/fish -#shellcheck disable=all - -function fish_greeting - if test -d "$HOME" - if test ! -e "$HOME"/.config/no-show-user-motd - if test -x "/usr/libexec/ublue-motd" - /usr/libexec/ublue-motd - end - end - end - - if set -q fish_private_mode - echo "fish is running in private mode, history will not be persisted." - end -end diff --git a/system_files/silverblue/usr/share/ublue-os/motd/bluefin.md b/system_files/shared/usr/share/ublue-os/motd/template.md similarity index 100% rename from system_files/silverblue/usr/share/ublue-os/motd/bluefin.md rename to system_files/shared/usr/share/ublue-os/motd/template.md diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/blue.json b/system_files/shared/usr/share/ublue-os/motd/themes/blue.json deleted file mode 100644 index 099421a126b..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/blue.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "33", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "33", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/green.json b/system_files/shared/usr/share/ublue-os/motd/themes/green.json deleted file mode 100644 index fd0326f7651..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/green.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "34", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "34", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/orange.json b/system_files/shared/usr/share/ublue-os/motd/themes/orange.json deleted file mode 100644 index cd8ca16162d..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/orange.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "208", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "208", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/pink.json b/system_files/shared/usr/share/ublue-os/motd/themes/pink.json deleted file mode 100644 index a5d65df5e7b..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/pink.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "212", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "212", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/purple.json b/system_files/shared/usr/share/ublue-os/motd/themes/purple.json deleted file mode 100644 index 8abe4451221..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/purple.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "165", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "165", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/red.json b/system_files/shared/usr/share/ublue-os/motd/themes/red.json deleted file mode 100644 index 700473dd5d5..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/red.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "203", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "203", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/slate.json b/system_files/shared/usr/share/ublue-os/motd/themes/slate.json deleted file mode 100644 index 3fbf5e82ed5..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/slate.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "104", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "104", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/teal.json b/system_files/shared/usr/share/ublue-os/motd/themes/teal.json deleted file mode 100644 index 1e0bc72e461..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/teal.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "44", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "44", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/shared/usr/share/ublue-os/motd/themes/yellow.json b/system_files/shared/usr/share/ublue-os/motd/themes/yellow.json deleted file mode 100644 index 24b268ef51c..00000000000 --- a/system_files/shared/usr/share/ublue-os/motd/themes/yellow.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "document": { - "margin": 2 - }, - "block_quote": { - "indent": 1, - "indent_token": "│ " - }, - "paragraph": {}, - "list": { - "level_indent": 2 - }, - "heading": { - "block_suffix": "\n", - "color": "220", - "bold": true - }, - "h1": { - "block_prefix": "\n", - "block_suffix": "\n" - }, - "h2": { - "prefix": "▌ " - }, - "h3": { - "prefix": "┃ " - }, - "h4": { - "prefix": "│ " - }, - "h5": { - "prefix": "┆ " - }, - "h6": { - "prefix": "┊ ", - "bold": false - }, - "text": {}, - "strikethrough": { - "crossed_out": true - }, - "emph": { - "italic": true - }, - "strong": { - "color": "220", - "bold": true - }, - "hr": { - "format": "\n──────\n" - }, - "item": { - "block_prefix": "• " - }, - "enumeration": { - "block_prefix": ". " - }, - "task": { - "ticked": "[✓] ", - "unticked": "[ ] " - }, - "link": { - "underline": true - }, - "link_text": { - "bold": true - }, - "image": { - "underline": true - }, - "image_text": { - "format": "Image: {{.text}}" - }, - "code": { - "prefix": " ", - "suffix": " ", - "bold": true - }, - "code_block": {}, - "table": {}, - "definition_list": {}, - "definition_term": {}, - "definition_description": { - "block_prefix": "\n🠶 " - }, - "html_block": {}, - "html_span": {} -} diff --git a/system_files/silverblue/usr/share/pixmaps/faces/bicycle.jpg b/system_files/silverblue/usr/share/pixmaps/faces/bicycle.jpg deleted file mode 100644 index 4920bec478e..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/bicycle.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/book.jpg b/system_files/silverblue/usr/share/pixmaps/faces/book.jpg deleted file mode 100644 index 5546e2d97c7..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/book.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/calculator.jpg b/system_files/silverblue/usr/share/pixmaps/faces/calculator.jpg deleted file mode 100644 index 35e0cf072a8..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/calculator.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/cat.jpg b/system_files/silverblue/usr/share/pixmaps/faces/cat.jpg deleted file mode 100644 index 73556f74c9a..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/cat.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/coffee2.jpg b/system_files/silverblue/usr/share/pixmaps/faces/coffee2.jpg deleted file mode 100644 index 685b7e13650..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/coffee2.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/flower2.jpg b/system_files/silverblue/usr/share/pixmaps/faces/flower2.jpg deleted file mode 100644 index 5fda5a77fbe..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/flower2.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/gamepad.jpg b/system_files/silverblue/usr/share/pixmaps/faces/gamepad.jpg deleted file mode 100644 index 76793148488..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/gamepad.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/guitar2.jpg b/system_files/silverblue/usr/share/pixmaps/faces/guitar2.jpg deleted file mode 100644 index d9f39496641..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/guitar2.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/headphones.jpg b/system_files/silverblue/usr/share/pixmaps/faces/headphones.jpg deleted file mode 100644 index c464fbaa272..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/headphones.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/hummingbird.jpg b/system_files/silverblue/usr/share/pixmaps/faces/hummingbird.jpg deleted file mode 100644 index 8d2bb138d20..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/hummingbird.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/mountain.jpg b/system_files/silverblue/usr/share/pixmaps/faces/mountain.jpg deleted file mode 100644 index cac217876b5..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/mountain.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/plane.jpg b/system_files/silverblue/usr/share/pixmaps/faces/plane.jpg deleted file mode 100644 index 9e807816de5..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/plane.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/surfer.jpg b/system_files/silverblue/usr/share/pixmaps/faces/surfer.jpg deleted file mode 100644 index 8603469b113..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/surfer.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/tomatoes.jpg b/system_files/silverblue/usr/share/pixmaps/faces/tomatoes.jpg deleted file mode 100644 index 2928cef8fd6..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/tomatoes.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/faces/tree.jpg b/system_files/silverblue/usr/share/pixmaps/faces/tree.jpg deleted file mode 100644 index c9711580057..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/faces/tree.jpg and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/fedora-gdm-logo.png b/system_files/silverblue/usr/share/pixmaps/fedora-gdm-logo.png deleted file mode 100644 index 35ec9020354..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/fedora-gdm-logo.png and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/fedora-logo-small.png b/system_files/silverblue/usr/share/pixmaps/fedora-logo-small.png deleted file mode 100644 index c45ebc13f12..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/fedora-logo-small.png and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/fedora-logo-sprite.png b/system_files/silverblue/usr/share/pixmaps/fedora-logo-sprite.png deleted file mode 100644 index 6f506db5cc6..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/fedora-logo-sprite.png and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/fedora-logo-sprite.svg b/system_files/silverblue/usr/share/pixmaps/fedora-logo-sprite.svg deleted file mode 100644 index 970f60a7028..00000000000 --- a/system_files/silverblue/usr/share/pixmaps/fedora-logo-sprite.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/system_files/silverblue/usr/share/pixmaps/fedora-logo.png b/system_files/silverblue/usr/share/pixmaps/fedora-logo.png deleted file mode 100644 index 3c82aa6fcb5..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/fedora-logo.png and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/fedora_logo_med.png b/system_files/silverblue/usr/share/pixmaps/fedora_logo_med.png deleted file mode 100644 index 92cb6dda4bf..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/fedora_logo_med.png and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/fedora_white_logo.svg b/system_files/silverblue/usr/share/pixmaps/fedora_white_logo.svg deleted file mode 100644 index ef3be3d7b33..00000000000 --- a/system_files/silverblue/usr/share/pixmaps/fedora_white_logo.svg +++ /dev/null @@ -1,15988 +0,0 @@ - - diff --git a/system_files/silverblue/usr/share/pixmaps/fedora_whitelogo.svg b/system_files/silverblue/usr/share/pixmaps/fedora_whitelogo.svg deleted file mode 100644 index ef3be3d7b33..00000000000 --- a/system_files/silverblue/usr/share/pixmaps/fedora_whitelogo.svg +++ /dev/null @@ -1,15988 +0,0 @@ - - diff --git a/system_files/silverblue/usr/share/pixmaps/fedora_whitelogo_med.png b/system_files/silverblue/usr/share/pixmaps/fedora_whitelogo_med.png deleted file mode 100644 index a46eda1b0ce..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/fedora_whitelogo_med.png and /dev/null differ diff --git a/system_files/silverblue/usr/share/pixmaps/system-logo-white.png b/system_files/silverblue/usr/share/pixmaps/system-logo-white.png deleted file mode 100644 index aa8899ad4ca..00000000000 Binary files a/system_files/silverblue/usr/share/pixmaps/system-logo-white.png and /dev/null differ