refactor: get uupd and nerdfonts-symbols from terra (#3025)

reasons stated in URL below

resolves: https://github.com/ublue-os/aurora/issues/3024
This commit is contained in:
renner 2026-10-14 16:19:20 +00:00 committed by GitHub
parent 25e7a6252b
commit 7d7c481881
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 36 additions and 14 deletions

View file

@ -0,0 +1,25 @@
[terra]
name=Terra $releasever
# disable mirrors because they are very flakey
baseurl=https://repos.fyralabs.com/terra$releasever
# metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever&arch=$basearch
metadata_expire=6h
type=rpm
gpgcheck=1
gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
repo_gpgcheck=1
enabled=0
enabled_metadata=1
countme=1
[terra-source]
name=Terra $releasever - Source
baseurl=https://repos.fyralabs.com/terra$releasever-source
# metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-source&arch=$basearch
metadata_expire=6h
type=rpm
gpgcheck=1
gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
repo_gpgcheck=1
enabled=0
enabled_metadata=0

View file

@ -134,12 +134,19 @@ COPR_UBLUE_OS_PACKAGES=(
oversteer-udev
# https://github.com/ublue-os/akmods/issues/537
ublue-os-selinux-workarounds
uupd
)
TERRA_PACKAGES=(
# our auto-updater
uupd
# used in motd, in general useful to have
nerdfontssymbolsonly-nerd-fonts
)
# Fedora Tailscale is usually behind
TAILSCALE=(tailscale)
dnf -y install --from-repo="terra" "${TERRA_PACKAGES[@]}"
COPR_PREFIX="copr:copr.fedorainfracloud.org"
dnf -y install --from-repo="${COPR_PREFIX}:ublue-os:packages" "${COPR_UBLUE_OS_PACKAGES[@]}"
@ -148,9 +155,9 @@ dnf -y install --from-repo="${COPR_PREFIX}:ublue-os:packages" "${COPR_UBLUE_OS_P
# so we can have less transactions, while still not being vulnerable to copr injections
# shellcheck disable=SC1010
dnf do -y \
--action install --from-repo='tailscale-stable' "${TAILSCALE[@]}" \
--action install --from-repo="${COPR_PREFIX}:ledif:kairpods" kairpods \
--action install --from-repo="${COPR_PREFIX}:lizardbyte:stable" Sunshine
--action install --from-repo="${COPR_PREFIX}:lizardbyte:stable" Sunshine \
--action install --from-repo='tailscale-stable' "${TAILSCALE[@]}"
# Packages to exclude - common to all versions
EXCLUDED_PACKAGES=(

View file

@ -20,13 +20,6 @@ curl -X 'GET' \
'https://flathub.org/api/v2/stats/io.github.kolunmi.Bazaar?all=false&days=1' \
-H 'accept: application/json' | jq -r ".installs_last_7_days" | numfmt --to=si --round=nearest > /usr/share/ublue-os/bazaar-install-count
# Nerdfont symbols
# to fix motd and prompt atleast temporarily
ghcurl "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/NerdFontsSymbolsOnly.zip" --retry 3 -o /tmp/nerdfontsymbols.zip
unzip /tmp/nerdfontsymbols.zip -d /tmp
mkdir -p /usr/share/fonts/nerd-fonts/NerdFontsSymbolsOnly/
mv /tmp/SymbolsNerdFont*.ttf /usr/share/fonts/nerd-fonts/NerdFontsSymbolsOnly/
# Bash Preexec v0.6.0
ghcurl https://raw.githubusercontent.com/rcaloras/bash-preexec/b73ed5f7f953207b958f15b1773721dded697ac3/bash-preexec.sh --retry 3 -Lo /usr/share/bash-preexec

View file

@ -4,7 +4,7 @@
set -eoux pipefail
# Speeds up local builds and workaround network flakes, mainly for COPR and negativo
# Speeds up local builds and workaround network flakes, mainly for COPR, negativo and terra
cp /etc/dnf/dnf.conf /etc/dnf/dnf.conf.bak
dnf config-manager setopt keepcache=1 timeout=60

View file

@ -18,9 +18,6 @@ setfattr -n user.component -v "homebrew" /usr/share/homebrew.tar.zst
setfattr -n user.component -v "aurora-offline-docs" /usr/share/doc/aurora/aurora.pdf
setfattr -n user.component -v "nerdfonts" /usr/share/fonts/nerd-fonts/NerdFontsSymbolsOnly
setfattr -n user.update-interval -v "yearly" /usr/share/fonts/nerd-fonts/NerdFontsSymbolsOnly
setfattr -n user.component -v "aurora-config" /usr/lib/systemd/system-generators/coreos-sulogin-force-generator
setfattr -n user.component -v "aurora-config" /usr/share/bash-preexec