From a34261c6e3ad308496509c34f6ba4da3e46f5c9b Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sun, 10 Mar 2024 20:04:48 +0100
Subject: [PATCH] desktop: jammy: kde-neon: more basic packages needed

- add network-manager & pulseaudio settings
- add discover, otherwise there is a broken icon on the dock
- add vault/scdaemon for gpg wallet
- enable debugs in create_desktop_package.sh; disable old postinst pa hack
---
 .../kde-plasma/armbian/create_desktop_package.sh | 16 ++++++++--------
 .../environments/kde-plasma/debian/postinst      |  2 +-
 .../environments/kde-neon/config_base/packages   |  5 +++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/config/desktop/common/environments/kde-plasma/armbian/create_desktop_package.sh b/config/desktop/common/environments/kde-plasma/armbian/create_desktop_package.sh
index 57e1d2edbc..c3f348eb49 100644
--- a/config/desktop/common/environments/kde-plasma/armbian/create_desktop_package.sh
+++ b/config/desktop/common/environments/kde-plasma/armbian/create_desktop_package.sh
@@ -1,18 +1,18 @@
 # install sddm greeter theme
-mkdir -p "${destination}"/usr/share/sddm/themes
-cp -R "${SRC}"/packages/blobs/desktop/sddm/themes/plasma-chili/ "${destination}"/usr/share/sddm/themes
+mkdir -pv "${destination}"/usr/share/sddm/themes
+cp -Rv "${SRC}"/packages/blobs/desktop/sddm/themes/plasma-chili/ "${destination}"/usr/share/sddm/themes
 
 # install default desktop settings
-mkdir -p "${destination}"/etc/skel
-cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel
+mkdir -pv "${destination}"/etc/skel
+cp -Rv "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel
 
 # install wallpapers
-mkdir -p "${destination}"/usr/share/backgrounds/armbian/
-cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian
+mkdir -pv "${destination}"/usr/share/backgrounds/armbian/
+cp -v "${SRC}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian
 
 # install logo for login screen
-mkdir -p "${destination}"/usr/share/pixmaps/armbian
-cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian
+mkdir -pv "${destination}"/usr/share/pixmaps/armbian
+cp -v "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian
 
 # set default wallpaper
 #echo "
diff --git a/config/desktop/common/environments/kde-plasma/debian/postinst b/config/desktop/common/environments/kde-plasma/debian/postinst
index 7b1fadb1e3..a8dc3b17e6 100755
--- a/config/desktop/common/environments/kde-plasma/debian/postinst
+++ b/config/desktop/common/environments/kde-plasma/debian/postinst
@@ -1,2 +1,2 @@
 # Disable Pulseaudio timer scheduling which does not work with sndhdmi driver
-if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i  /etc/pulse/default.pa; fi
+# if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi
diff --git a/config/desktop/jammy/environments/kde-neon/config_base/packages b/config/desktop/jammy/environments/kde-neon/config_base/packages
index 641f274aec..c86b8697f8 100644
--- a/config/desktop/jammy/environments/kde-neon/config_base/packages
+++ b/config/desktop/jammy/environments/kde-neon/config_base/packages
@@ -1,3 +1,8 @@
 neon-desktop
 kde-standard
 sddm
+plasma-nm
+plasma-pa
+plasma-discover
+plasma-vault
+scdaemon