From 66d622379056d15edf9db18b22b337ebf29ca3ef Mon Sep 17 00:00:00 2001
From: Adam Boardman <adamboardman@gmail.com>
Date: Mon, 1 May 2023 12:08:16 +0100
Subject: [PATCH] Astro tweaks, tidying and removing items included in the
 kde-plasma-desktop meta package

---
 astroslide.yaml          | 32 --------------------------------
 gemian-common.yaml       |  6 +++---
 variants/kde-plasma.yaml | 25 +------------------------
 3 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/astroslide.yaml b/astroslide.yaml
index 467afff..4463481 100644
--- a/astroslide.yaml
+++ b/astroslide.yaml
@@ -22,8 +22,6 @@ actions:
     description: Installing Astro Slide-specific packages
     target-device: mt6873
     packages:
-#      - bluebinder
-#      - media-hub
       - gemian-system
       - lxc-android
       - lxc
@@ -68,36 +66,6 @@ actions:
     description: depmod kernel modules (needs /lib/modules/N.N.N)
     command: depmod -a 4.14.186
 
-{{ if eq $variant "lxqt" }}
-#  - action: recipe
-#    recipe: variants/lxqt.yaml
-{{ end }}
-
-{{ if eq $variant "mate" }}
-#  - action: apt
-#    description: Installing MATE desktop environment
-#    packages:
-#      - lxdm
-#      - mate-desktop-environment
-#      - xserver-xorg
-#      - xserver-xorg-input-evdev
-{{ end }}
-
-{{ if eq $variant "kde-plasma" }}
-#  - action: recipe
-#    recipe: variants/kde-plasma.yaml
-{{ end }}
-
-#  - action: run
-#    chroot: true
-#    description: Fix default DPI
-#    command: sed -e "s@\\[server\\]@[server]\\narg=/usr/bin/Xorg -dpi 192\n@" -i /etc/lxdm/lxdm.conf
-
-#  - action: run
-#    chroot: true
-#    description: Removing xserver-xorg-input-libinput as it does not work with touchscreen yet
-#    command: apt remove xserver-xorg-input-libinput
-
   - action: run
     chroot: true
     description: Removing /var/log/journal to avoid persisant journaling
diff --git a/gemian-common.yaml b/gemian-common.yaml
index f638fb5..5573501 100644
--- a/gemian-common.yaml
+++ b/gemian-common.yaml
@@ -27,9 +27,9 @@ actions:
     packages:
 #      - audiosystem-passthrough
 #      - dialer-app
-#      - drihybris
+      - drihybris
 #      - gemian-lock
-#      - glamor-hybris
+      - glamor-hybris
       - hybris-usb
       - usbutils
       - libhybris
@@ -42,7 +42,7 @@ actions:
 #      - repowerd
       - urfkill
       - xkb-data
-#      - xserver-xorg-video-hwcomposer
+      - xserver-xorg-video-hwcomposer
 #      - xss-lock
 #      - camera-app
       - halium-wrappers
diff --git a/variants/kde-plasma.yaml b/variants/kde-plasma.yaml
index 009d765..5a0c774 100644
--- a/variants/kde-plasma.yaml
+++ b/variants/kde-plasma.yaml
@@ -4,40 +4,17 @@ actions:
   - action: apt
     description: Installing KDE Plasma desktop environment
     packages:
-      - breeze-gtk-theme
+      - kde-plasma-desktop
       - chromium
       - chromium-sandbox
-      - gstreamer1.0-plugins-good
-      - gstreamer1.0-plugins-bad
       - gstreamer1.0-qt5
-      - fonts-noto
-      - kate
-      - kde-config-gtk-style
-      - kde-plasma-desktop
-      - khotkeys
-      - kio-extras
-      - kscreen
-      - ksysguard
-      - kwin-x11
-      - libpam-kwallet5
       - lxdm
       - network-manager
-      - plasma-browser-integration
-      - plasma-discover
-      - plasma-pa
-      - plasma-nm
-      - powerdevil
-      - sni-qt
-      - systemsettings
-      - xserver-xorg
       - xserver-xorg-input-evdev
-      - codi-app
       - kde-spectacle
       - bluetooth
       - rfkill
-      - bluedevil
       - bluez-tools
-      - pulseaudio-module-bluetooth
 
   - action: run
     chroot: true