From 568f14dac2a25d2790b6c54aac9993437a814602 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Tue, 15 Jun 2021 20:49:47 +0200
Subject: [PATCH] use wallpaper as background with sddm Nordic theme

---
 pkg/de-p1st-installer/example-vbox.cfg | 9 +++++++++
 pkg/de-p1st-sddm-theme-nordic/PKGBUILD | 9 +++++++--
 pkg/de-p1st-xfce4/PKGBUILD             | 5 +++--
 pkg/de-p1st-xfce4/TESTED               | 3 ++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkg/de-p1st-installer/example-vbox.cfg b/pkg/de-p1st-installer/example-vbox.cfg
index 297c6bd..bc9ced7 100644
--- a/pkg/de-p1st-installer/example-vbox.cfg
+++ b/pkg/de-p1st-installer/example-vbox.cfg
@@ -47,3 +47,12 @@ ADDITIONAL_PKGS+=('de-p1st-gpu-generic' 'de-p1st-xfce4-hidpi' 'de-p1st-sddm-auto
 ADDITIONAL_PKGS+=('de-p1st-smartcard')
 # other programs
 ADDITIONAL_PKGS+=('nextcloud-client' 'keepassxc' 'xournalpp' 'intellij-idea-ultimate-edition' 'intellij-idea-ultimate-edition-jre')
+# gallery / image viewer
+ADDITIONAL_PKGS+=('nomacs' 'qt5-imageformats')
+#
+# pulseaudio - base
+ADDITIONAL_PKGS+=('pulseaudio' 'pulseaudio-alsa' 'pavucontrol')
+# pulseaudio - xfce4
+ADDITIONAL_PKGS+=('xfce4-pulseaudio-plugin')
+# sound theme
+ADDITIONAL_PKGS+=('libcanberra' 'libcanberra-pulse')
\ No newline at end of file
diff --git a/pkg/de-p1st-sddm-theme-nordic/PKGBUILD b/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
index 03c2e52..4484cbe 100644
--- a/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
+++ b/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=sddm-theme-nordic
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.4
+pkgver=0.0.5
 pkgrel=1
 pkgdesc="sddm with Nordic theme"
 arch=('any')
@@ -12,9 +12,10 @@ license=('MIT')
 depends=('sddm' 'sddm-nordic-theme-git')
 # Without plasma-framework the following error occurs:
 # Main.qml:28:1: module "org.kde.plasma.extras" is not installed
+# TODO: is this reported upstream (on AUR?)
 depends+=('plasma-framework')
-# See TODO below
 depends+=('holo' 'git' 'base')
+depends+=('de-p1st-wallpaper')
 
 makedepends=('git')
 install='.install'
@@ -28,6 +29,10 @@ package() {
 
   install -Dm0644 p1st-theme.conf "$pkgdir"/etc/sddm.conf.d/p1st-theme.conf
 
+  # Replace theme background:
+  # Add symlink to background of "de-p1st-wallpaper"
+  ln -s /usr/share/backgrounds/de-p1st.jpg "$pkgdir"/usr/share/holo/files/"$pkgname"/usr/share/sddm/themes/Nordic/assets/bg.jpg
+
   # TODO: Fix upstream? See AUR comment: https://aur.archlinux.org/pkgbase/nordic-kde-git/#comment-807577
   # Fix Nordic theme "Main.qml" -> Property "Battery" not found / missing
   install -Dm0544 Main.qml.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/usr/share/sddm/themes/Nordic/Main.qml.holoscript
diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD
index 3ee61ca..4d7ba41 100644
--- a/pkg/de-p1st-xfce4/PKGBUILD
+++ b/pkg/de-p1st-xfce4/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=xfce4
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.16
+pkgver=0.0.17
 pkgrel=1
 pkgdesc="XFCE4 with configuration"
 arch=('any')
@@ -64,7 +64,8 @@ depends+=(de-p1st-keyboard-x11)
 
 # ============== browser ==============
 depends+=(firefox)
-
+# ============== wallpaper ==============
+depends+=(de-p1st-wallpaper)
 
 package() {
   cd "${_reponame}/pkg/${pkgname}"
diff --git a/pkg/de-p1st-xfce4/TESTED b/pkg/de-p1st-xfce4/TESTED
index 0c14864..53ca525 100644
--- a/pkg/de-p1st-xfce4/TESTED
+++ b/pkg/de-p1st-xfce4/TESTED
@@ -4,4 +4,5 @@ desktop-icons on primary display is set to "true"
 "screenshot" launcher works
 lower (2nd) panel removed
 
-TODO: Whisker Menu: Favourite: Firefox
\ No newline at end of file
+TODO: Whisker Menu: Favourite: Firefox
+TODO: depend on "de-p1st-wallpaper" and use this for xfce