From 809f0ee2040a97e7de6d6f72f9315d7c421afcad Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Thu, 7 Mar 2024 03:30:47 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20adjust=20for=20plasma6=20and=20k?=
 =?UTF-8?q?f6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                       |  1 +
 archiso/airootfs/etc/environment |  2 --
 archiso/packages_kde.x86_64      |  9 +++------
 util-iso.sh                      | 16 ++++++++++++++++
 4 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 archiso/airootfs/etc/environment

diff --git a/.gitignore b/.gitignore
index fb73aba..e395f53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ archiso/packages.x86_64
 archiso/airootfs/etc/gdm/
 archiso/airootfs/etc/systemd/system/display-manager.service
 archiso/airootfs/etc/motd
+archiso/airootfs/etc/environment
diff --git a/archiso/airootfs/etc/environment b/archiso/airootfs/etc/environment
deleted file mode 100644
index 0a2ce11..0000000
--- a/archiso/airootfs/etc/environment
+++ /dev/null
@@ -1,2 +0,0 @@
-QT_QPA_PLATFORMTHEME=qt5ct
-ZPOOL_VDEV_NAME_PATH=1
diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_kde.x86_64
index 5f148f0..9e591d1 100644
--- a/archiso/packages_kde.x86_64
+++ b/archiso/packages_kde.x86_64
@@ -9,7 +9,6 @@ base
 bash-completion
 bcachefs-tools
 bind
-boost-libs
 breeze-gtk
 brltty
 broadcom-wl-dkms
@@ -90,7 +89,7 @@ iwd
 jfsutils
 kde-gtk-config
 kinit
-kio5
+kio
 kitty-terminfo
 konsole
 kpmcore
@@ -164,14 +163,13 @@ pipewire-alsa
 pipewire-jack
 pipewire-pulse
 plasma-desktop
-plasma-framework5
+libplasma
 plasma-integration
 plasma-nm
 plasma-pa
 plasma-workspace
 polkit
 polkit-kde-agent
-polkit-qt5
 poppler-glib
 power-profiles-daemon
 ppp
@@ -181,7 +179,6 @@ pv
 python
 python-defusedxml
 qemu-guest-agent
-qt5-xmlpatterns
 realtime-privileges
 refind
 reflector
@@ -199,7 +196,7 @@ smartmontools
 smbclient
 snapper
 sof-firmware
-solid5
+solid
 spice-vdagent
 squashfs-tools
 sudo
diff --git a/util-iso.sh b/util-iso.sh
index e24a038..949aed9 100755
--- a/util-iso.sh
+++ b/util-iso.sh
@@ -114,6 +114,20 @@ change_grub_version() {
     sed -i "s/CACHYOS_VERSION=\".*\"/CACHYOS_VERSION=\"${_version}\"/" ${src_dir}/archiso/grub/grub.cfg
 }
 
+generate_environment() {
+    local _profile="$1"
+    if [ "$_profile" == "kde" ]; then
+        cat << 'EOF' > ${src_dir}/archiso/airootfs/etc/environment
+ZPOOL_VDEV_NAME_PATH=1
+EOF
+    else
+        cat << 'EOF' > ${src_dir}/archiso/airootfs/etc/environment
+QT_QPA_PLATFORMTHEME=qt5ct
+ZPOOL_VDEV_NAME_PATH=1
+EOF
+    fi
+}
+
 prepare_profile(){
     profile=$1
 
@@ -150,6 +164,8 @@ prepare_profile(){
         die "Unknown profile: [%s]" "${profile}"
     fi
 
+    generate_environment "${profile}"
+
     iso_file=$(gen_iso_fn).iso
 }