clean up missed leftover, dead code

1 files changed, 67 insertions, 167 deletions

diff --git a/packages/plasma.scm b/packages/plasma.scm
index d7b042d..e6c81b7 100644
--- a/packages/plasma.scm
+++ b/packages/plasma.scm
@@ -18,176 +18,76 @@
   #:use-module (guix packages))
 
 (define-public plasma*
-  (let* ((inputs-1 (list packagekit-qt5
-			 signon-plugin-oauth2
-			 signond
-			 attica
-			 appstream-qt
-			 baloo
-			 breeze
-			 breeze-icons
-			 eudev
-			 fontconfig
-			 glib
-			 ibus
-			 kaccounts-integration
-			 kactivities
-			 kactivities-stats
-			 kauth
-			 karchive
-			 kcmutils
-			 kconfig
-			 kcoreaddons
-			 kcrash
-			 kdbusaddons
-			 kdeclarative
-			 kded
-			 kdesu
-			 kdelibs4support
-			 kglobalaccel
-			 kguiaddons
-			 kholidays
-			 ki18n
-			 kiconthemes
-			 kidletime
-			 kinit
-			 kio
-			 kitemmodels
-			 knewstuff
-			 knotifications
-			 knotifyconfig
-			 kpackage
-			 kpeople
-			 krunner
-			 kscreenlocker
-			 ktexteditor
-			 ktextwidgets
-			 kunitconversion
-			 kuserfeedback
-			 kwallet
-			 kwayland
-			 kwin
-			 layer-shell-qt
-			 libaccounts-qt
-			 libcanberra
-			 libkscreen
-			 libksysguard
-			 libqalculate
-			 gmp
-			 mpfr
-			 libsm
-			 libxi
-			 libxft
-			 libxkbcommon
-			 libxrender
-			 libxtst
-			 networkmanager-qt
-			 phonon
-			 pipewire
-			 plasma-framework
-			 plasma-wayland-protocols
-			 prison
-			 qqc2-desktop-style
-			 qtbase-5
-			 qtdeclarative-5
-			 qtquickcontrols-5
-			 qtquickcontrols2-5
-			 qtwayland-5
-			 qtx11extras
-			 wayland
-			 wayland-protocols
-			 xcb-util
-			 xcb-util-image
-			 xcb-util-keysyms
-			 xdg-user-dirs
+  (package (inherit plasma)
+	   (propagated-inputs (list kdeclarative ;; require by sddm breeze theme
+				    qqc2-desktop-style ; qtquickcontrols2 theme
+				    baloo
+				    breeze-icons ; default mouse icon
+				    breeze
+				    breeze-gtk
+				    drkonqi
+				    kactivitymanagerd ; require this run dbus
+				    kde-cli-tools
+				    kdecoration
+				    kded
+				    kdeplasma-addons
+				    kgamma
+				    kgpg
+				    khotkeys
+				    ktexteditor
 
-			 ;; These are needed for Xserver
-			 xf86-input-libinput
-			 xf86-input-evdev
-			 xorg-server
-			 xf86-input-synaptics
-			 xkeyboard-config
-			 libxkbfile
-			 libxcursor
-			 libxkbcommon))
-	 (inputs-2 (list libcanberra
-			 plasma-framework
-			 pipewire
-			 pulseaudio))
-	 (plasma-desktop* (package (inherit plasma-desktop)
-				   (inputs inputs-1)))
-	 (plasma-pa* (package (inherit plasma-pa)
-			      (propagated-inputs inputs-2))))
-    (package (inherit plasma)
-	     (propagated-inputs (list kdeclarative ;; require by sddm breeze theme
-				      qqc2-desktop-style ; qtquickcontrols2 theme
-				      baloo
-				      breeze-icons ; default mouse icon
-				      breeze
-				      breeze-gtk
-				      drkonqi
-				      kactivitymanagerd ; require this run dbus
-				      kde-cli-tools
-				      kdecoration
-				      kded
-				      kdeplasma-addons
-				      kgamma
-				      kgpg
-				      khotkeys
-				      ktexteditor
+				    kscreen
+				    libkscreen
 
-				      kscreen
-				      libkscreen
+				    ksystemstats
+				    kwallet
+				    kwallet-pam
+				    kwin
+				    kinit
 
-				      ksystemstats
-				      kwallet
-				      kwallet-pam
-				      kwin
-				      kinit
+				    libksysguard
+				    milou
+				    ;; oxygen
+				    oxygen-sounds
 
-				      libksysguard
-				      milou
-				      ;; oxygen
-				      oxygen-sounds
+				    kde-gtk-config
+				    kdesu
+				    krunner
+				    kinfocenter
+				    kscreenlocker
+				    ksshaskpass
+				    discover
+				    kmenuedit
+				    plasma-welcome
+				    plasma-browser-integration
+				    plasma-desktop
+				    plasma-disks
+				    polkit-kde-agent
+				    system-settings
+				    xdg-desktop-portal-kde
+				    ;; module cyclic referencing
+				    (module-ref
+				     (resolve-interface
+				      '(gnu packages kde-systemtools))
+				     'dolphin)
+				    (module-ref
+				     (resolve-interface
+				      '(gnu packages kde-systemtools))
+				     'konsole)
+				    (module-ref
+				     (resolve-interface
+				      '(gnu packages kde-systemtools))
+				     'spectacle)
 
-				      kde-gtk-config
-				      kdesu
-				      krunner
-				      kinfocenter
-				      kscreenlocker
-				      ksshaskpass
-				      discover
-				      kmenuedit
-				      plasma-welcome
-				      plasma-browser-integration
-				      plasma-desktop
-				      plasma-disks
-				      polkit-kde-agent
-				      system-settings
-				      xdg-desktop-portal-kde
-				      ;; module cyclic referencing
-				      (module-ref
-				       (resolve-interface
-					'(gnu packages kde-systemtools))
-				       'dolphin)
-				      (module-ref
-				       (resolve-interface
-					'(gnu packages kde-systemtools))
-				       'konsole)
-				      (module-ref
-				       (resolve-interface
-					'(gnu packages kde-systemtools))
-				       'spectacle)
+				    kwayland-integration
+				    plasma-firewall
+				    plasma-integration
+				    plasma-nm
+				    plasma-pa
+				    plasma-systemmonitor
+				    ;; plasma-thunderbolt ;; waiting for bolt
 
-				      kwayland-integration
-				      plasma-firewall
-				      plasma-integration
-				      plasma-nm
-				      plasma-pa
-				      plasma-systemmonitor
-				      ;; plasma-thunderbolt ;; waiting for bolt
-
-				      kglobalaccel
-				      plasma-vault
-				      plasma-workspace
-				      powerdevil)))))
+				    kglobalaccel
+				    plasma-vault
+				    plasma-workspace
+				    powerdevil))))