You've already forked fedora-bootc
Compare commits
2 Commits
13111c5203
...
7e14520e7b
| Author | SHA1 | Date | |
|---|---|---|---|
7e14520e7b
|
|||
|
52588956a9
|
103
build_files/common/packages.sh
Executable file
103
build_files/common/packages.sh
Executable file
@@ -0,0 +1,103 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -ouex pipefail
|
||||||
|
|
||||||
|
### Install packages
|
||||||
|
|
||||||
|
# Packages can be installed from any enabled yum repo on the image.
|
||||||
|
# RPMfusion repos are available by default in ublue main images
|
||||||
|
# List of rpmfusion packages can be found here:
|
||||||
|
# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1
|
||||||
|
|
||||||
|
# Enable fedora-multimedia with a higher priority than default
|
||||||
|
if ! grep -q fedora-multimedia <(dnf5 repolist); then
|
||||||
|
# Enable or Install Repofile
|
||||||
|
#dnf5 install \
|
||||||
|
# https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
|
||||||
|
# https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
|
||||||
|
|
||||||
|
# Enable fedora-multimedia
|
||||||
|
dnf5 config-manager setopt fedora-multimedia.enabled=1 ||
|
||||||
|
dnf5 config-manager addrepo --from-repofile="https://negativo17.org/repos/fedora-multimedia.repo"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set higher priority
|
||||||
|
dnf5 config-manager setopt fedora-multimedia.priority=90
|
||||||
|
|
||||||
|
# use override to replace mesa and others with less crippled versions
|
||||||
|
OVERRIDES=(
|
||||||
|
"intel-gmmlib"
|
||||||
|
"intel-mediasdk"
|
||||||
|
"intel-vpl-gpu-rt"
|
||||||
|
"libheif"
|
||||||
|
"libva"
|
||||||
|
"libva-intel-media-driver"
|
||||||
|
"mesa-dri-drivers"
|
||||||
|
"mesa-filesystem"
|
||||||
|
"mesa-libEGL"
|
||||||
|
"mesa-libGL"
|
||||||
|
"mesa-libgbm"
|
||||||
|
"mesa-va-drivers"
|
||||||
|
"mesa-vulkan-drivers"
|
||||||
|
)
|
||||||
|
|
||||||
|
dnf5 distro-sync --skip-unavailable -y --repo='fedora-multimedia' "${OVERRIDES[@]}"
|
||||||
|
dnf5 versionlock add "${OVERRIDES[@]}"
|
||||||
|
|
||||||
|
# Add Flathub to the image for eventual application
|
||||||
|
mkdir -p /etc/flatpak/remotes.d/
|
||||||
|
curl --retry 3 -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||||
|
|
||||||
|
# Remove Fedora's package that enforces their own (filtered) version of the
|
||||||
|
# flathub repo is present, as-well as the system-installed Firefox as I prefer to use the Flatpak version
|
||||||
|
dnf5 remove -y fedora-flathub-remote firefox firefox-langpacks
|
||||||
|
|
||||||
|
# Install my own layered packages
|
||||||
|
dnf5 install -y \
|
||||||
|
fish \
|
||||||
|
gvfs-nfs \
|
||||||
|
openssl \
|
||||||
|
wl-clipboard \
|
||||||
|
ffmpeg ffmpeg-libs ffmpegthumbnailer \
|
||||||
|
heif-pixbuf-loader intel-vaapi-driver libavcodec libheif \
|
||||||
|
libcamera libcamera-gstreamer libcamera-ipa libcamera-tools pipewire-plugin-libcamera \
|
||||||
|
gnome-shell-extension-appindicator \
|
||||||
|
1password 1password-cli \
|
||||||
|
tailscale \
|
||||||
|
waypipe \
|
||||||
|
htop
|
||||||
|
|
||||||
|
# Remove additional repositories Fedora comes with out of the box
|
||||||
|
# And don't raise an error if any of these files does not exist when attempting
|
||||||
|
# to delete them.
|
||||||
|
rm \
|
||||||
|
/etc/yum.repos.d/fedora-cisco-openh264.repo \
|
||||||
|
/etc/yum.repos.d/google-chrome.repo \
|
||||||
|
/etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo \
|
||||||
|
/etc/yum.repos.d/rpmfusion-nonfree-steam.repo \
|
||||||
|
/etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo \
|
||||||
|
2>&1
|
||||||
|
|
||||||
|
# Add country query to all repo metalinks
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
sed -i -e '/^metalink\=/s/\$releasever\&arch\=\$basearch$/\$releasever\&arch\=\$basearch\&country\=KR,JP,TW/g' /etc/yum.repos.d/*.repo
|
||||||
|
|
||||||
|
# Add 1Password repo
|
||||||
|
#rpmkeys --import https://downloads.1password.com/linux/keys/1password.asc
|
||||||
|
cp /ctx/rpm-keys/1password.asc /etc/pki/rpm-gpg/1password.asc
|
||||||
|
sh -c 'echo -e "[1password]\nname=1Password Stable Channel\nbaseurl=https://downloads.1password.com/linux/rpm/stable/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/1password.asc\"" > /etc/yum.repos.d/1password.repo'
|
||||||
|
|
||||||
|
# Add Tailscale repo
|
||||||
|
#rpmkeys --import https://pkgs.tailscale.com/stable/fedora/repo.gpg
|
||||||
|
#dnf5 config-manager addrepo --from-repofile=https://pkgs.tailscale.com/stable/fedora/tailscale.repo
|
||||||
|
cp /ctx/rpm-keys/tailscale.gpg /etc/pki/rpm-gpg/tailscale.gpg
|
||||||
|
sh -c 'echo -e "[tailscale-stable]\nname=Tailscale stable\nbaseurl=https://pkgs.tailscale.com/stable/fedora/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/tailscale.gpg\"" > /etc/yum.repos.d/tailscale.repo'
|
||||||
|
|
||||||
|
cd /tmp
|
||||||
|
wget -O bitwarden.rpm https://bitwarden.com/download/?app=desktop &
|
||||||
|
platform=linux &
|
||||||
|
variant=rpm
|
||||||
|
dnf install -y ./bitwarden.rpm
|
||||||
|
|
||||||
|
# Update all existing packages
|
||||||
|
# dnf5 update -y
|
||||||
6
build_files/common/services.sh
Executable file
6
build_files/common/services.sh
Executable file
@@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -ouex pipefail
|
||||||
|
|
||||||
|
# Enable Tailscale service
|
||||||
|
systemctl enable tailscaled
|
||||||
12
build_files/common/setup.sh
Executable file
12
build_files/common/setup.sh
Executable file
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -ouex pipefail
|
||||||
|
|
||||||
|
# Copy System Files onto root
|
||||||
|
rsync -rvK /ctx/sys_files/ /
|
||||||
|
|
||||||
|
# Copy cosign.pub key into the right location
|
||||||
|
mkdir -p /etc/pki/containers
|
||||||
|
cp /ctx/cosign.pub /etc/pki/containers/davejansen.pub
|
||||||
|
|
||||||
|
./packages.sh
|
||||||
@@ -2,106 +2,7 @@
|
|||||||
|
|
||||||
set -ouex pipefail
|
set -ouex pipefail
|
||||||
|
|
||||||
# Copy System Files onto root
|
/ctx/common/setup.sh
|
||||||
rsync -rvK /ctx/sys_files/ /
|
|
||||||
|
|
||||||
# Copy cosign.pub key into the right location
|
|
||||||
mkdir -p /etc/pki/containers
|
|
||||||
cp /ctx/cosign.pub /etc/pki/containers/davejansen.pub
|
|
||||||
|
|
||||||
### Install packages
|
|
||||||
|
|
||||||
# Packages can be installed from any enabled yum repo on the image.
|
|
||||||
# RPMfusion repos are available by default in ublue main images
|
|
||||||
# List of rpmfusion packages can be found here:
|
|
||||||
# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1
|
|
||||||
|
|
||||||
# Install RPMFusion and enable fedora-multimedia with a higher priority than default
|
|
||||||
if ! grep -q fedora-multimedia <(dnf5 repolist); then
|
|
||||||
# Enable or Install Repofile
|
|
||||||
#dnf5 install \
|
|
||||||
# https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
|
|
||||||
# https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
|
|
||||||
|
|
||||||
# Enable fedora-multimedia
|
|
||||||
dnf5 config-manager setopt fedora-multimedia.enabled=1 ||
|
|
||||||
dnf5 config-manager addrepo --from-repofile="https://negativo17.org/repos/fedora-multimedia.repo"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set higher priority
|
|
||||||
dnf5 config-manager setopt fedora-multimedia.priority=90
|
|
||||||
|
|
||||||
# Remove Fedora's package that enforces their own (filtered) version of the
|
|
||||||
# flathub repo is present, as-well as the system-installed Firefox as I prefer to use the Flatpak version
|
|
||||||
dnf5 remove -y fedora-flathub-remote firefox firefox-langpacks
|
|
||||||
|
|
||||||
# Add Flathub to the image for eventual application
|
|
||||||
mkdir -p /etc/flatpak/remotes.d/
|
|
||||||
curl --retry 3 -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
|
|
||||||
|
|
||||||
# use override to replace mesa and others with less crippled versions
|
|
||||||
OVERRIDES=(
|
|
||||||
"intel-gmmlib"
|
|
||||||
"intel-mediasdk"
|
|
||||||
"intel-vpl-gpu-rt"
|
|
||||||
"libheif"
|
|
||||||
"libva"
|
|
||||||
"libva-intel-media-driver"
|
|
||||||
"mesa-dri-drivers"
|
|
||||||
"mesa-filesystem"
|
|
||||||
"mesa-libEGL"
|
|
||||||
"mesa-libGL"
|
|
||||||
"mesa-libgbm"
|
|
||||||
"mesa-va-drivers"
|
|
||||||
"mesa-vulkan-drivers"
|
|
||||||
)
|
|
||||||
|
|
||||||
dnf5 distro-sync --skip-unavailable -y --repo='fedora-multimedia' "${OVERRIDES[@]}"
|
|
||||||
dnf5 versionlock add "${OVERRIDES[@]}"
|
|
||||||
|
|
||||||
# Remove additional repositories Fedora comes with out of the box
|
|
||||||
# And don't raise an error if any of these files does not exist when attempting
|
|
||||||
# to delete them.
|
|
||||||
rm \
|
|
||||||
/etc/yum.repos.d/fedora-cisco-openh264.repo \
|
|
||||||
/etc/yum.repos.d/google-chrome.repo \
|
|
||||||
/etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo \
|
|
||||||
/etc/yum.repos.d/rpmfusion-nonfree-steam.repo \
|
|
||||||
/etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo \
|
|
||||||
2>&1
|
|
||||||
|
|
||||||
# Add country query to all repo metalinks
|
|
||||||
# shellcheck disable=SC2016
|
|
||||||
sed -i -e '/^metalink\=/s/\$releasever\&arch\=\$basearch$/\$releasever\&arch\=\$basearch\&country\=KR,JP,TW/g' /etc/yum.repos.d/*.repo
|
|
||||||
|
|
||||||
# Add 1Password repo
|
|
||||||
#rpmkeys --import https://downloads.1password.com/linux/keys/1password.asc
|
|
||||||
cp /ctx/rpm-keys/1password.asc /etc/pki/rpm-gpg/1password.asc
|
|
||||||
sh -c 'echo -e "[1password]\nname=1Password Stable Channel\nbaseurl=https://downloads.1password.com/linux/rpm/stable/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/1password.asc\"" > /etc/yum.repos.d/1password.repo'
|
|
||||||
|
|
||||||
# Add Tailscale repo
|
|
||||||
#rpmkeys --import https://pkgs.tailscale.com/stable/fedora/repo.gpg
|
|
||||||
#dnf5 config-manager addrepo --from-repofile=https://pkgs.tailscale.com/stable/fedora/tailscale.repo
|
|
||||||
cp /ctx/rpm-keys/tailscale.gpg /etc/pki/rpm-gpg/tailscale.gpg
|
|
||||||
sh -c 'echo -e "[tailscale-stable]\nname=Tailscale stable\nbaseurl=https://pkgs.tailscale.com/stable/fedora/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/tailscale.gpg\"" > /etc/yum.repos.d/tailscale.repo'
|
|
||||||
|
|
||||||
# Update all existing packages
|
|
||||||
# dnf5 update -y
|
|
||||||
|
|
||||||
# Install my own layered packages
|
|
||||||
dnf5 install -y \
|
|
||||||
fish \
|
|
||||||
gvfs-nfs \
|
|
||||||
openssl \
|
|
||||||
wl-clipboard \
|
|
||||||
ffmpeg ffmpeg-libs ffmpegthumbnailer \
|
|
||||||
heif-pixbuf-loader intel-vaapi-driver libavcodec libheif \
|
|
||||||
libcamera libcamera-gstreamer libcamera-ipa libcamera-tools pipewire-plugin-libcamera \
|
|
||||||
gnome-shell-extension-appindicator \
|
|
||||||
1password 1password-cli \
|
|
||||||
tailscale \
|
|
||||||
waypipe \
|
|
||||||
htop
|
|
||||||
|
|
||||||
# Install Niri, the scrollable-tiling window compositor
|
# Install Niri, the scrollable-tiling window compositor
|
||||||
# https://yalter.github.io/niri/
|
# https://yalter.github.io/niri/
|
||||||
@@ -109,7 +10,6 @@ dnf5 -y copr enable avengemedia/dms
|
|||||||
dnf5 -y install niri dms alacritty brightnessctl
|
dnf5 -y install niri dms alacritty brightnessctl
|
||||||
dnf5 -y copr disable avengemedia/dms
|
dnf5 -y copr disable avengemedia/dms
|
||||||
|
|
||||||
# Enable Tailscale service
|
/ctx/common/services.sh
|
||||||
systemctl enable tailscaled
|
|
||||||
|
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
|||||||
@@ -2,91 +2,7 @@
|
|||||||
|
|
||||||
set -ouex pipefail
|
set -ouex pipefail
|
||||||
|
|
||||||
# Copy System Files onto root
|
/ctx/common/setup.sh
|
||||||
rsync -rvK /ctx/sys_files/ /
|
|
||||||
|
|
||||||
# Copy cosign.pub key into the right location
|
|
||||||
mkdir -p /etc/pki/containers
|
|
||||||
cp /ctx/cosign.pub /etc/pki/containers/davejansen.pub
|
|
||||||
|
|
||||||
### Install packages
|
|
||||||
|
|
||||||
# Packages can be installed from any enabled yum repo on the image.
|
|
||||||
# RPMfusion repos are available by default in ublue main images
|
|
||||||
# List of rpmfusion packages can be found here:
|
|
||||||
# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1
|
|
||||||
|
|
||||||
# Install RPMFusion and enable fedora-multimedia with a higher priority than default
|
|
||||||
if ! grep -q fedora-multimedia <(dnf5 repolist); then
|
|
||||||
# Enable or Install Repofile
|
|
||||||
#dnf5 install \
|
|
||||||
# https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
|
|
||||||
# https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
|
|
||||||
|
|
||||||
# Enable fedora-multimedia
|
|
||||||
dnf5 config-manager setopt fedora-multimedia.enabled=1 ||
|
|
||||||
dnf5 config-manager addrepo --from-repofile="https://negativo17.org/repos/fedora-multimedia.repo"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set higher priority
|
|
||||||
dnf5 config-manager setopt fedora-multimedia.priority=90
|
|
||||||
|
|
||||||
# Remove Fedora's package that enforces their own (filtered) version of the
|
|
||||||
# flathub repo is present, as-well as the system-installed Firefox as I prefer to use the Flatpak version
|
|
||||||
dnf5 remove -y fedora-flathub-remote
|
|
||||||
|
|
||||||
# Add Flathub to the image for eventual application
|
|
||||||
mkdir -p /etc/flatpak/remotes.d/
|
|
||||||
curl --retry 3 -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
|
|
||||||
|
|
||||||
# use override to replace mesa and others with less crippled versions
|
|
||||||
OVERRIDES=(
|
|
||||||
"intel-gmmlib"
|
|
||||||
"intel-mediasdk"
|
|
||||||
"intel-vpl-gpu-rt"
|
|
||||||
"libheif"
|
|
||||||
"libva"
|
|
||||||
"libva-intel-media-driver"
|
|
||||||
"mesa-dri-drivers"
|
|
||||||
"mesa-filesystem"
|
|
||||||
"mesa-libEGL"
|
|
||||||
"mesa-libGL"
|
|
||||||
"mesa-libgbm"
|
|
||||||
"mesa-va-drivers"
|
|
||||||
"mesa-vulkan-drivers"
|
|
||||||
)
|
|
||||||
|
|
||||||
dnf5 distro-sync --skip-unavailable -y --repo='fedora-multimedia' "${OVERRIDES[@]}"
|
|
||||||
dnf5 versionlock add "${OVERRIDES[@]}"
|
|
||||||
|
|
||||||
# Remove additional repositories Fedora comes with out of the box
|
|
||||||
# And don't raise an error if any of these files does not exist when attempting
|
|
||||||
# to delete them.
|
|
||||||
rm \
|
|
||||||
/etc/yum.repos.d/fedora-cisco-openh264.repo \
|
|
||||||
/etc/yum.repos.d/google-chrome.repo \
|
|
||||||
/etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo \
|
|
||||||
/etc/yum.repos.d/rpmfusion-nonfree-steam.repo \
|
|
||||||
/etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo \
|
|
||||||
2>&1
|
|
||||||
|
|
||||||
# Add country query to all repo metalinks
|
|
||||||
# shellcheck disable=SC2016
|
|
||||||
sed -i -e '/^metalink\=/s/\$releasever\&arch\=\$basearch$/\$releasever\&arch\=\$basearch\&country\=KR,JP,TW/g' /etc/yum.repos.d/*.repo
|
|
||||||
|
|
||||||
# Add 1Password repo
|
|
||||||
#rpmkeys --import https://downloads.1password.com/linux/keys/1password.asc
|
|
||||||
cp /ctx/rpm-keys/1password.asc /etc/pki/rpm-gpg/1password.asc
|
|
||||||
sh -c 'echo -e "[1password]\nname=1Password Stable Channel\nbaseurl=https://downloads.1password.com/linux/rpm/stable/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/1password.asc\"" > /etc/yum.repos.d/1password.repo'
|
|
||||||
|
|
||||||
# Add Tailscale repo
|
|
||||||
#rpmkeys --import https://pkgs.tailscale.com/stable/fedora/repo.gpg
|
|
||||||
#dnf5 config-manager addrepo --from-repofile=https://pkgs.tailscale.com/stable/fedora/tailscale.repo
|
|
||||||
cp /ctx/rpm-keys/tailscale.gpg /etc/pki/rpm-gpg/tailscale.gpg
|
|
||||||
sh -c 'echo -e "[tailscale-stable]\nname=Tailscale stable\nbaseurl=https://pkgs.tailscale.com/stable/fedora/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/tailscale.gpg\"" > /etc/yum.repos.d/tailscale.repo'
|
|
||||||
|
|
||||||
# Update all existing packages
|
|
||||||
# dnf5 update -y
|
|
||||||
|
|
||||||
# Install Niri, the scrollable-tiling window compositor
|
# Install Niri, the scrollable-tiling window compositor
|
||||||
# https://yalter.github.io/niri/
|
# https://yalter.github.io/niri/
|
||||||
@@ -94,24 +10,11 @@ dnf5 -y copr enable avengemedia/dms
|
|||||||
|
|
||||||
# Install my own layered packages
|
# Install my own layered packages
|
||||||
dnf5 install -y \
|
dnf5 install -y \
|
||||||
git \
|
|
||||||
fish \
|
|
||||||
gvfs-nfs \
|
|
||||||
openssl \
|
|
||||||
wl-clipboard \
|
|
||||||
ffmpeg ffmpeg-libs ffmpegthumbnailer \
|
|
||||||
heif-pixbuf-loader intel-vaapi-driver libavcodec libheif \
|
|
||||||
libcamera libcamera-gstreamer libcamera-ipa libcamera-tools pipewire-plugin-libcamera \
|
|
||||||
1password 1password-cli \
|
|
||||||
tailscale \
|
|
||||||
waypipe \
|
|
||||||
htop \
|
|
||||||
alacritty \
|
alacritty \
|
||||||
niri dms
|
niri dms
|
||||||
|
|
||||||
dnf5 -y copr disable avengemedia/dms
|
dnf5 -y copr disable avengemedia/dms
|
||||||
|
|
||||||
# Enable Tailscale service
|
/ctx/common/services.sh
|
||||||
systemctl enable tailscaled
|
|
||||||
|
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
|||||||
Reference in New Issue
Block a user