Big refactor to use custom base images
This commit is contained in:
@@ -1,12 +1,29 @@
|
||||
modules:
|
||||
- type: script
|
||||
env:
|
||||
CSFG: /usr/lib/systemd/system-generators/coreos-sulogin-force-generator
|
||||
snippets:
|
||||
- systemctl set-default graphical.target
|
||||
- from-file: common/updates.yml
|
||||
- from-file: common/bluebuild-logo.yml
|
||||
- type: os-release
|
||||
properties:
|
||||
NAME: WunkerOS
|
||||
ID: wunker_os
|
||||
PRETTY_NAME: Wunker OS
|
||||
# use CoreOS' generator for emergency/rescue boot
|
||||
# see detail: https://github.com/ublue-os/main/issues/653
|
||||
- curl -sSLo ${CSFG} https://raw.githubusercontent.com/coreos/fedora-coreos-config/refs/heads/stable/overlay.d/05core/usr/lib/systemd/system-generators/coreos-sulogin-force-generator
|
||||
- chmod +x ${CSFG}
|
||||
- type: files
|
||||
files:
|
||||
- source: bootc-update
|
||||
destination: /usr/lib/systemd/system
|
||||
- type: systemd
|
||||
system:
|
||||
masked:
|
||||
- rpm-ostreed-automatic.timer
|
||||
enabled:
|
||||
- bootc-fetch-apply-updates.timer
|
||||
- type: copy
|
||||
src: files/base/usr/share/plymouth
|
||||
dest: /usr/share/plymouth
|
||||
# - type: os-release
|
||||
# properties:
|
||||
# NAME: WunkerOS
|
||||
# ID: wunker_os
|
||||
# PRETTY_NAME: Wunker OS
|
||||
- from-file: common/post-build.yml
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
modules:
|
||||
# - type: files
|
||||
# # - type: files-update
|
||||
# # source: local
|
||||
# files:
|
||||
# - source: bluebuild-logo
|
||||
# destination: /
|
||||
- type: copy
|
||||
src: files/bluebuild-logo/
|
||||
dest: /
|
||||
# - type: script
|
||||
# scripts:
|
||||
# - initramfs.sh
|
||||
@@ -1,15 +0,0 @@
|
||||
stages:
|
||||
- name: blue-build
|
||||
from: rust
|
||||
modules:
|
||||
- type: containerfile
|
||||
snippets:
|
||||
- |
|
||||
RUN cargo install blue-build --all-features --target x86_64-unknown-linux-gnu \
|
||||
&& mkdir -p /out/ \
|
||||
&& mv $CARGO_HOME/bin/bluebuild /out/bluebuild
|
||||
modules:
|
||||
- type: copy
|
||||
from: blue-build
|
||||
src: /out/bluebuild
|
||||
dest: /usr/bin/bluebuild
|
||||
@@ -1,125 +0,0 @@
|
||||
---
|
||||
# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
|
||||
modules:
|
||||
- type: dnf
|
||||
install:
|
||||
packages:
|
||||
- dnf5-plugins
|
||||
- type: dnf
|
||||
repos:
|
||||
files:
|
||||
- https://negativo17.org/repos/fedora-multimedia.repo
|
||||
copr:
|
||||
- ublue-os/staging
|
||||
- kylegospo/oversteer
|
||||
install:
|
||||
packages:
|
||||
- https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-%OS_VERSION%.noarch.rpm
|
||||
- https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-%OS_VERSION%.noarch.rpm
|
||||
- type: script
|
||||
snippets:
|
||||
- dnf -y config-manager setopt 'fedora-multimedia.priority=90'
|
||||
- type: dnf
|
||||
install:
|
||||
packages:
|
||||
- mesa-libxatracker
|
||||
replace:
|
||||
- from-repo: fedora-multimedia
|
||||
packages:
|
||||
- libheif
|
||||
- libva
|
||||
- libva-intel-media-driver
|
||||
- mesa-dri-drivers
|
||||
- mesa-filesystem
|
||||
- mesa-libEGL
|
||||
- mesa-libGL
|
||||
- mesa-libgbm
|
||||
- mesa-libglapi
|
||||
- mesa-libxatracker
|
||||
- mesa-va-drivers
|
||||
- mesa-vulkan-drivers
|
||||
- libvdpau
|
||||
- type: dnf
|
||||
remove:
|
||||
auto-remove: false
|
||||
packages:
|
||||
# - fdk-aac-free
|
||||
# - ffmpeg-free
|
||||
# - google-noto-sans-cjk-vf-fonts
|
||||
# - libavcodec-free
|
||||
# - libavdevice-free
|
||||
# - libavfilter-free
|
||||
# - libavformat-free
|
||||
# - libavutil-free
|
||||
# - libpostproc-free
|
||||
# - libswresample-free
|
||||
# - libswscale-free
|
||||
# - default-fonts-cjk-sans
|
||||
# - ffmpegthumbnailer
|
||||
- plasma-discover-rpm-ostree
|
||||
install:
|
||||
packages:
|
||||
- alsa-firmware
|
||||
# - android-udev-rules
|
||||
- apr
|
||||
- apr-util
|
||||
- distrobox
|
||||
- ffmpeg
|
||||
- ffmpeg-libs
|
||||
- ffmpegthumbnailer
|
||||
- flatpak-spawn
|
||||
- fuse
|
||||
- fzf
|
||||
- google-noto-sans-balinese-fonts
|
||||
- google-noto-sans-cjk-fonts
|
||||
- google-noto-sans-javanese-fonts
|
||||
- google-noto-sans-sundanese-fonts
|
||||
- grub2-tools-extra
|
||||
- heif-pixbuf-loader
|
||||
- htop
|
||||
- intel-vaapi-driver
|
||||
- just
|
||||
- kernel-tools
|
||||
- libcamera
|
||||
- libcamera-tools
|
||||
- libcamera-gstreamer
|
||||
- libcamera-ipa
|
||||
- libfdk-aac
|
||||
- libratbag-ratbagd
|
||||
- libva-utils
|
||||
- lshw
|
||||
- net-tools
|
||||
- nvme-cli
|
||||
- nvtop
|
||||
- openrgb-udev-rules
|
||||
- openssl
|
||||
- oversteer-udev
|
||||
- pam-u2f
|
||||
- pam_yubico
|
||||
- pamu2fcfg
|
||||
- pipewire-libs-extra
|
||||
- pipewire-plugin-libcamera
|
||||
- powerstat
|
||||
- smartmontools
|
||||
- solaar-udev
|
||||
- squashfs-tools
|
||||
- symlinks
|
||||
- tcpdump
|
||||
- tmux
|
||||
- traceroute
|
||||
- vim
|
||||
- wireguard-tools
|
||||
- wl-clipboard
|
||||
- yubikey-manager
|
||||
- zstd
|
||||
- icoutils
|
||||
- kate
|
||||
- kio-admin
|
||||
- ksshaskpass
|
||||
- kf6-kimageformats
|
||||
- qt6-qtimageformats
|
||||
- type: containerfile
|
||||
snippets:
|
||||
- |
|
||||
RUN --mount=type=bind,from=ghcr.io/ublue-os/config,src=/rpms,dst=/tmp/rpms \
|
||||
ls -lh /tmp/rpms/ && dnf -y install /tmp/rpms/ublue-os-luks.noarch.rpm && ostree container commit
|
||||
@@ -9,6 +9,10 @@ modules:
|
||||
- google-cloud-sdk.repo
|
||||
- https://cli.github.com/packages/rpm/gh-cli.repo
|
||||
- https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
|
||||
# copr:
|
||||
# - name: ublue-os/packages
|
||||
# chroot: fedora-42-x86_64
|
||||
nonfree: negativo17
|
||||
group-install:
|
||||
packages:
|
||||
- development-tools
|
||||
@@ -48,7 +52,7 @@ modules:
|
||||
- tofu
|
||||
- terraform
|
||||
- terraform-ls
|
||||
- android-udev-rules
|
||||
- android-tools
|
||||
- argon2
|
||||
- type: script
|
||||
scripts:
|
||||
|
||||
@@ -2,13 +2,11 @@
|
||||
# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
|
||||
modules:
|
||||
- from-file: common/common.yml
|
||||
- from-file: common/cosmic.yml
|
||||
- from-file: common/pipewire-tweaks.yml
|
||||
- from-file: common/jp-packages.yml
|
||||
- from-file: common/gaming.yml
|
||||
- from-file: common/dev-packages.yml
|
||||
- from-file: common/dev-apps.yml
|
||||
- from-file: common/updates.yml
|
||||
- type: files
|
||||
files:
|
||||
- source: distrobox
|
||||
@@ -20,5 +18,4 @@ modules:
|
||||
nerd-fonts:
|
||||
- JetBrainsMono
|
||||
- NerdFontsSymbolsOnly
|
||||
- from-file: common/bluebuild-logo.yml
|
||||
- from-file: common/jp-chezmoi.yml
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
type: rpm-ostree
|
||||
remove:
|
||||
- firefox
|
||||
- firefox-langpacks
|
||||
@@ -1,22 +0,0 @@
|
||||
modules:
|
||||
- type: dnf
|
||||
install:
|
||||
packages:
|
||||
- sway
|
||||
- wofi
|
||||
- light
|
||||
- swaybg
|
||||
- swayidle
|
||||
- waybar
|
||||
- mako
|
||||
- fontawesome-fonts
|
||||
- type: dnf
|
||||
repos:
|
||||
copr:
|
||||
- eddsalkield/swaylock-effects
|
||||
remove:
|
||||
packages:
|
||||
- swaylock
|
||||
install:
|
||||
packages:
|
||||
- swaylock-effects
|
||||
@@ -1,7 +1,6 @@
|
||||
modules:
|
||||
- from-file: common/common.yml
|
||||
- from-file: common/updates.yml
|
||||
- from-file: common/bluebuild-logo.yml
|
||||
- from-file: common/jp-chezmoi.yml
|
||||
- type: dnf
|
||||
repos:
|
||||
|
||||
@@ -27,5 +27,7 @@ modules:
|
||||
- libreoffice
|
||||
- from-file: common/ms-fonts.yml
|
||||
- from-file: common/updates.yml
|
||||
- from-file: common/bluebuild-logo.yml
|
||||
- type: copy
|
||||
src: files/base/usr/share/plymouth
|
||||
dest: /usr/share/plymouth
|
||||
- from-file: common/post-build.yml
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
---
|
||||
# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
|
||||
name: jp-desktop-nvidia
|
||||
# base-image: ghcr.io/ublue-os/base-nvidia
|
||||
# image-version: latest
|
||||
base-image: ghcr.io/ublue-os/bazzite-nvidia-open
|
||||
# image-version: stable
|
||||
image-version: "42.20250828.1"
|
||||
# Bazzite
|
||||
# base-image: ghcr.io/ublue-os/bazzite-nvidia-open
|
||||
# image-version: "42.20250828.1"
|
||||
|
||||
# Custom Base
|
||||
base-image: registry.gitlab.com/wunker-bunker/wunker-os/cosmic-nvidia
|
||||
image-version: 42
|
||||
description: The image of Wunker OS for JP's desktop gaming.
|
||||
blue-build-tag: none
|
||||
nushell-version: none
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
---
|
||||
# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
|
||||
name: jp-laptop
|
||||
# base-image: ghcr.io/ublue-os/kinoite-main
|
||||
base-image: ghcr.io/ublue-os/bazzite
|
||||
# image-version: stable
|
||||
image-version: "42.20250828"
|
||||
# base-image: ghcr.io/ublue-os/bazzite
|
||||
# image-version: "42.20250828"
|
||||
base-image: registry.gitlab.com/wunker-bunker/wunker-os/cosmic
|
||||
image-version: 42
|
||||
description: The image of Wunker OS for JP's Laptop.
|
||||
stages:
|
||||
- from-file: common/helix.yml
|
||||
|
||||
Reference in New Issue
Block a user