From 56ab41774dbb8cc2c908106310f826e7f5c9e17e Mon Sep 17 00:00:00 2001
From: Ian Monroe <imonroe@kde.org>
Date: Tue, 10 Dec 2024 14:54:46 -0800
Subject: [PATCH] install all packages using mkosi.conf.d files

remove the call to --packages
Attempted to keep everything, with the exception of the redundant
systemd/systemd-git packages
---
 .gitignore                                    |  2 +
 build.sh                                      | 76 -------------------
 mkosi.conf.d/00-packages-core.conf            | 12 ++-
 mkosi.conf.d/00-packages-sysinfo.conf         | 10 ++-
 mkosi.conf.d/10-packages-cli.conf             | 22 +++---
 mkosi.conf.d/10-packages-efi.conf             |  3 +-
 mkosi.conf.d/20-packages-network.conf         |  7 ++
 mkosi.conf.d/50-packages-graphics.conf        |  4 +-
 .../50-packages-kde-dependencies.conf         | 26 +++++++
 mkosi.conf.d/50-packages-sound.conf           | 11 +++
 mkosi.conf.d/55-packages-kde.conf             |  8 ++
 mkosi.conf.d/60-packages-hw-enablement.conf   |  8 ++
 mkosi.conf.d/70-packages-build.conf           | 12 +++
 mkosi.conf.d/99-packages-development.conf     |  3 +
 14 files changed, 110 insertions(+), 94 deletions(-)
 create mode 100644 mkosi.conf.d/20-packages-network.conf
 create mode 100644 mkosi.conf.d/50-packages-kde-dependencies.conf
 create mode 100644 mkosi.conf.d/50-packages-sound.conf
 create mode 100644 mkosi.conf.d/55-packages-kde.conf
 create mode 100644 mkosi.conf.d/70-packages-build.conf

diff --git a/.gitignore b/.gitignore
index c6e8bab..90d02a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@
 mkosi.local.conf
 
 kde-linux_*
+/mkosi.sandbox/etc/pacman.conf
+/mkosi.sandbox/etc/pacman.d/mirrorlist
diff --git a/build.sh b/build.sh
index ec28696..75ef33f 100755
--- a/build.sh
+++ b/build.sh
@@ -9,81 +9,6 @@
 
 set -ex
 
-packages=(
-    sddm
-    bash-completion
-    pacman
-    mesa
-    pipewire
-    pipewire-pulse
-    pipewire-zeroconf
-    pipewire-libcamera
-    noto-fonts
-    acpid
-    busybox
-    nvme-cli
-    bind
-    dmidecode
-    ntfs-3g
-    iproute2
-    tpm2-tss
-    xz
-    wireplumber
-    flatpak
-    apparmor
-    ffmpeg # ffmpegthumbs
-    jxrlib # kimageformats
-    libavif # kimageformats
-    libheif # kimageformats
-    libjxl # kimageformats
-    libraw # kimageformats
-    openexr # kimageformats
-    freerdp2 # krdp
-    libmtp # kio-extras, for MTP support
-    libappimage # kio-extras, for AppImage app thumbnails
-    editorconfig-core-c # ktexteditor
-    aspell # sonnet
-    hspell # sonnet
-
-    # Install build and runtime dependencies
-    git base-devel cmake yaml-cpp boost-libs boost dosfstools btrfs-progs glib2-devel
-    # NOTE: plasma-workspace depends on phonon (to build integration plugins **for** phonon) but doesn't actually
-    #   need a working backend so we build without vlc for now.
-    # For discover backend
-    fwupd
-    # For kio-extras
-    smbclient
-    # For selenium
-    python-atspi
-    # For print-manager
-    cups cups-browsed system-config-printer
-    # For kdenetwork-filesharing
-    samba
-    # For spectacle
-    opencv
-    # For fingerprint login
-    fprintd
-    # For DDC/CI external monitors brightness; https://wiki.archlinux.org/title/backlight
-    ddcutil
-    # For users KCM
-    accountsservice
-
-    # All the KDE we plan to include in the base image
-    $(pacman --sync --groups --quiet kde-linux)
-
-    # AUR packages
-    snapd steam-devices-git systemd-bootchart
-
-    systemd-git
-    systemd-resolvconf-git
-    systemd-sysvcompat-git
-    systemd-ukify-git
-    #probably can be removed:
-    arch-install-scripts
-)
-printf -v packages_str "%s," "${packages[@]}"
-packages_str=${packages_str%,}
-
 VERSION=$(date +%Y%m%d%H%M) # Build version, will just be YYYYmmddHHMM for now
 OUTPUT=kde-linux_$VERSION   # Built rootfs path (mkosi uses this directory by default)
 
@@ -113,7 +38,6 @@ mkosi \
     --image-version="$VERSION" \
     --package-cache-dir=/var/cache/mkosi.pacman \
     --output-directory=. \
-    --package="${packages_str}" \
     "$@"
 
 # Create a directory structure for the UKIs.
diff --git a/mkosi.conf.d/00-packages-core.conf b/mkosi.conf.d/00-packages-core.conf
index 047cd42..90289c1 100644
--- a/mkosi.conf.d/00-packages-core.conf
+++ b/mkosi.conf.d/00-packages-core.conf
@@ -4,6 +4,7 @@
 [Content]
 Packages=archlinux-keyring
          base
+         btrfs-progs
          kernel-modules-hook
          kmod
          linux
@@ -17,9 +18,14 @@ Packages=archlinux-keyring
          qt6-multimedia-ffmpeg
          plymouth
          socat
-         systemd
-         systemd-resolvconf
-         systemd-sysvcompat
+         systemd-git
+         systemd-resolvconf-git
+         systemd-sysvcompat-git
+         systemd-ukify-git
          xdg-desktop-portal-gtk # GTK/Flatpak icon settings syncing
          xdg-user-dirs
          xsettingsd # GTK/Flatpak theming, scaling, and theme changes without restart
+
+         apparmor
+         snapd
+         flatpak
diff --git a/mkosi.conf.d/00-packages-sysinfo.conf b/mkosi.conf.d/00-packages-sysinfo.conf
index 5417bea..76f8cbc 100644
--- a/mkosi.conf.d/00-packages-sysinfo.conf
+++ b/mkosi.conf.d/00-packages-sysinfo.conf
@@ -4,9 +4,15 @@
 # Info center stuff
 
 [Content]
-Packages=aha
+Packages=acpid
+         aha
          clinfo
+         # For DDC/CI external monitors brightness; https://wiki.archlinux.org/title/backlight
+         ddcutil
+         dmidecode
          mesa-utils # This provides both eglinfo and glxinfo
+         nvme-cli
          vulkan-tools # This provides vulkaninfo
          wayland-utils # This provides wayland-info
-         xorg-xdpyinfo # Required for kinfocenter X11 info tab (including xwayland)
\ No newline at end of file
+         xorg-xdpyinfo # Required for kinfocenter X11 info tab (including xwayland)
+
diff --git a/mkosi.conf.d/10-packages-cli.conf b/mkosi.conf.d/10-packages-cli.conf
index a63eded..7be7f85 100644
--- a/mkosi.conf.d/10-packages-cli.conf
+++ b/mkosi.conf.d/10-packages-cli.conf
@@ -4,22 +4,24 @@
 # Modern CLI tools!
 
 [Content]
-Packages=mcfly
-         htop
+Packages=bash-completion
          bat
+         busybox
          duf
+         fastfetch
          fd
+         gping
+         grml-zsh-config
+         htop
+         jq
+         mcfly
+         nano
+         openssh
+         powertop
+         procs
          ripgrep
          tldr
-         gping
-         procs
-         nano
-         powertop
          wget
          wl-clipboard
-         fastfetch
          zsh
-         grml-zsh-config
          zsh-completions
-         openssh
-         jq
diff --git a/mkosi.conf.d/10-packages-efi.conf b/mkosi.conf.d/10-packages-efi.conf
index 2ab9345..67020ec 100644
--- a/mkosi.conf.d/10-packages-efi.conf
+++ b/mkosi.conf.d/10-packages-efi.conf
@@ -2,8 +2,7 @@
 # SPDX-FileCopyrightText: 2023 Harald Sitter <sitter@kde.org>
 
 [Content]
-Packages=systemd-ukify
-         shim
+Packages=shim
          amd-ucode
          intel-ucode
          edk2-shell
diff --git a/mkosi.conf.d/20-packages-network.conf b/mkosi.conf.d/20-packages-network.conf
new file mode 100644
index 0000000..d39f933
--- /dev/null
+++ b/mkosi.conf.d/20-packages-network.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: Ian Monroe <imonroe@kde.org
+
+[Content]
+Packages=bind
+         iproute2
+         ntfs-3g
diff --git a/mkosi.conf.d/50-packages-graphics.conf b/mkosi.conf.d/50-packages-graphics.conf
index 397820e..98bd488 100644
--- a/mkosi.conf.d/50-packages-graphics.conf
+++ b/mkosi.conf.d/50-packages-graphics.conf
@@ -3,7 +3,9 @@
 
 # nvidia-open appears to contain vulkan support already
 [Content]
-Packages=nvidia-open
+Packages=mesa
+         nvidia-open
          vulkan-icd-loader
          vulkan-intel
          vulkan-radeon
+
diff --git a/mkosi.conf.d/50-packages-kde-dependencies.conf b/mkosi.conf.d/50-packages-kde-dependencies.conf
new file mode 100644
index 0000000..cc7dbbc
--- /dev/null
+++ b/mkosi.conf.d/50-packages-kde-dependencies.conf
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: Ian Monroe <imonroe@kde.org
+
+[Content]
+
+Packages=ffmpeg # ffmpegthumbs
+         jxrlib # kimageformats
+         libavif # kimageformats
+         libheif # kimageformats
+         libjxl # kimageformats
+         libraw # kimageformats
+         openexr # kimageformats
+
+         accountsservice # For users KCM
+         editorconfig-core-c # ktexteditor
+         freerdp2 # krdp
+         libappimage # kio-extras, for AppImage app thumbnails
+         libmtp # kio-extras, for MTP support
+
+         aspell # sonnet
+         hspell # sonnet
+         opencv # For spectacle
+         samba # For kdenetwork-filesharing
+
+         fwupd # for Discovery backend
+         smbclient # For kio-extras
diff --git a/mkosi.conf.d/50-packages-sound.conf b/mkosi.conf.d/50-packages-sound.conf
new file mode 100644
index 0000000..804390a
--- /dev/null
+++ b/mkosi.conf.d/50-packages-sound.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: Ian Monroe <imonroe@kde.org
+
+[Content]
+Packages=
+    pipewire
+    pipewire-pulse
+    pipewire-zeroconf
+    pipewire-libcamera
+    wireplumber
+
diff --git a/mkosi.conf.d/55-packages-kde.conf b/mkosi.conf.d/55-packages-kde.conf
new file mode 100644
index 0000000..7101f2d
--- /dev/null
+++ b/mkosi.conf.d/55-packages-kde.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: Ian Monroe <imonroe@kde.org
+
+# Let's go bananas
+
+[Content]
+Packages=sddm
+         kde-linux
diff --git a/mkosi.conf.d/60-packages-hw-enablement.conf b/mkosi.conf.d/60-packages-hw-enablement.conf
index 2643faa..4591164 100644
--- a/mkosi.conf.d/60-packages-hw-enablement.conf
+++ b/mkosi.conf.d/60-packages-hw-enablement.conf
@@ -11,3 +11,11 @@ Packages=dnsmasq # Needed for hotspot creation and networking in VMs
          power-profiles-daemon # Enables switching dedicated power profiles
          sof-firmware # Supports various audio chipsets
          splix # Supports certain Samsung printers
+         steam-devices-git
+         tpm2-tss
+         # For print-manager
+         cups
+         cups-browsed
+         system-config-printer
+         fprintd          # For fingerprint login
+         dosfstools
diff --git a/mkosi.conf.d/70-packages-build.conf b/mkosi.conf.d/70-packages-build.conf
new file mode 100644
index 0000000..bfed200
--- /dev/null
+++ b/mkosi.conf.d/70-packages-build.conf
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: Ian Monroe <imonroe@kde.org
+
+[Content]
+Packages=boost
+         boost-libs
+         cmake
+         glib2-devel
+         yaml-cpp
+         arch-install-scripts
+         pacman
+
diff --git a/mkosi.conf.d/99-packages-development.conf b/mkosi.conf.d/99-packages-development.conf
index 7fb4edb..4b1ccd8 100644
--- a/mkosi.conf.d/99-packages-development.conf
+++ b/mkosi.conf.d/99-packages-development.conf
@@ -22,7 +22,10 @@ Packages=base-devel
          perf
          podman
          podman-compose
+         python-atspi # For selenium
          qemu-desktop
+         systemd-bootchart
          tree
          vim
          virt-manager
+         xz