diff --git a/distro/camel.toml b/distro/camel.toml index 4e8c503..392a97b 100644 --- a/distro/camel.toml +++ b/distro/camel.toml @@ -147,7 +147,7 @@ status = "in [tanin]" [[packages.rebuilt_aur]] name = "calamares" reason = "GUI installer for the ISO — AUR-only, not in official repos" -status = "TODO — heavy Qt build; rebuild into [tanin] (finish-tanin-repo.sh / BUILD.md one-liner)" +status = "in [tanin] (built without sudo — all makedeps were present)" [[packages.rebuilt_aur]] name = "paru (or paru-bin)" diff --git a/iso/build-profile/packages.x86_64 b/iso/build-profile/packages.x86_64 index 6616b34..9ec270a 100644 --- a/iso/build-profile/packages.x86_64 +++ b/iso/build-profile/packages.x86_64 @@ -127,57 +127,60 @@ xfsprogs xl2tpd zsh # TANINUX additions — appended to releng's packages.x86_64 by bootstrap-profile.sh. +# IMPORTANT: pacman package lists do NOT allow inline comments. Keep every +# comment on its own line — a stray "# ..." after a package name turns the whole +# line into an invalid package (that was the kitty/flatpak "target not found"). # (bootstrap also swaps the live kernel linux -> linux-zen.) -# The live ISO IS the installable system (Calamares clones it via unpackfs). -# --- the whole TANINUX desktop (niri/eww/greeter/theme/apps from [tanin]) --- +# the whole TANINUX desktop (niri/eww/greeter/theme/apps from [tanin]) tanin-desktop -# --- kernel (zen) --- +# kernel (zen) linux-zen linux-zen-headers -# --- Btrfs + automatic snapshots (pre-update rollback via snapper) --- +# Btrfs + automatic snapshots btrfs-progs snapper snap-pac -# --- boot splash --- +# boot splash plymouth -# --- live installer (removed from target by Calamares' packages module) --- -calamares +# live installer: cage hosts calamares. calamares is AUR -> served from [tanin] +# (rebuild via finish-tanin-repo.sh / the calamares one-liner in BUILD.md). cage +calamares -# --- target bootloader = systemd-boot (part of systemd) + UEFI var tool --- +# target bootloader efibootmgr -# --- partitioning / filesystems --- +# partitioning / filesystems gptfdisk dosfstools e2fsprogs -# --- preinstalled apps (decided) --- +# preinstalled apps firefox thunderbird -kitty # extra terminal (foot stays the niri/eww default) +kitty nautilus -flatpak # Flathub remote configured post-install -# paru # AUR helper — MUST be rebuilt into [tanin] first (else build fails) +flatpak +#paru -# --- media bundle --- +# media (gstreamer-vaapi was removed from Arch -> gst-plugin-va is the successor) mpv loupe gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav -gstreamer-vaapi +gst-plugin-va -# --- fonts & emoji --- +# fonts & emoji noto-fonts noto-fonts-emoji noto-fonts-cjk -# --- utilities --- +# utilities file-roller diff --git a/iso/overrides/packages.x86_64 b/iso/overrides/packages.x86_64 index ea9b320..70f03cd 100644 --- a/iso/overrides/packages.x86_64 +++ b/iso/overrides/packages.x86_64 @@ -24,6 +24,11 @@ plymouth cage calamares +# resolve provider prompts non-interactively (mkarchiso can't answer them): +# audio -> pipewire's JACK (matches the pipewire stack); netfilter -> iptables(-nft) +pipewire-jack +iptables + # target bootloader efibootmgr