From f557e87eff8a142aac171d1067b3d7a83c8c32e7 Mon Sep 17 00:00:00 2001
From: Franz Geffke <franz@pantherx.org>
Date: Sun, 24 Dec 2023 10:24:01 +0000
Subject: desktop: drop custom lxqt

---
 px/services/base.scm      | 17 ++++++-----------
 px/services/databases.scm |  6 ------
 px/services/desktop.scm   | 32 --------------------------------
 3 files changed, 6 insertions(+), 49 deletions(-)

(limited to 'px/services')

diff --git a/px/services/base.scm b/px/services/base.scm
index 4715cf2..b7b732c 100644
--- a/px/services/base.scm
+++ b/px/services/base.scm
@@ -44,9 +44,7 @@
 
             %px-core-arm-services
             %px-gui-arm-services
-            %px-desktop-arm-services)
-
-  #:re-export (px-desktop-service-type))
+            %px-desktop-arm-services))
 
 ;;;
 ;;;
@@ -75,10 +73,10 @@
 ;;;
 
 (define %px-desktop-ee-services
+  ;; TODO: Does not include default desktop
   (append (list (service px-device-identity-service-type)
-                (service px-user-identity-service-type)
-                ;; Desktop
-                (service px-desktop-service-type)) %px-desktop-services-base))
+                (service px-user-identity-service-type))
+				%px-desktop-services-base))
 
 ;;;
 ;;; SERVER
@@ -145,12 +143,9 @@
          %px-core-arm-services))
 
 (define %px-desktop-arm-services
+  ;; TODO: Does not include default desktop
   (append (list (service dhcp-client-service-type)
                 (service sddm-service-type
-                         (sddm-configuration (minimum-uid 1000)
-                                             (theme "px-sddm-theme")))
-                (service px-desktop-service-type
-                         (px-desktop-configuration (lxqt lxqt-modified)
-                                                   (default-packages '()))))
+                         (sddm-configuration (minimum-uid 1000))))
           (modify-services %desktop-services
             (delete network-manager-service-type))))
diff --git a/px/services/databases.scm b/px/services/databases.scm
index 6cf459e..85107a0 100644
--- a/px/services/databases.scm
+++ b/px/services/databases.scm
@@ -115,9 +115,3 @@ storage:
                                                      (const %mongodb-accounts))))
                 (default-value (mongodb-configuration))))
 
-(use-modules (gnu system)
-             (gnu bootloader)
-             (gnu bootloader grub)
-             (gnu system file-systems)
-             (px system config))
-
diff --git a/px/services/desktop.scm b/px/services/desktop.scm
index cc8f9b6..a97cfb0 100644
--- a/px/services/desktop.scm
+++ b/px/services/desktop.scm
@@ -38,7 +38,6 @@
   #:use-module (ice-9 match)
   #:export (px-desktop-configuration 
             px-desktop-configuration?
-            px-desktop-service-type
 
             polkit-network-manager-service
             polkit-elogind-service
@@ -47,37 +46,6 @@
 
             %px-desktop-services-base))
 
-;;
-;; PantherX desktop service type
-;;
-
-(define-record-type* <px-desktop-configuration> px-desktop-configuration
-                     make-px-desktop-configuration
-  px-desktop-configuration?
-  (lxqt px-config-package
-        (default lxqt-modified))
-  (default-packages px-config-default-packages
-                    (default (list px-desktop-defaults))))
-
-(define (px-desktop-polkit-settings config)
-  "Return the list of LXQt dependencies that provide polkit actions and
-rules."
-  (list lxqt-admin))
-
-(define px-desktop-profile-packages
-  (lambda (config)
-    (append (list (px-config-package config))
-            (px-config-default-packages config))))
-
-(define px-desktop-service-type
-  (service-type (name 'px-desktop)
-                (extensions (list (service-extension polkit-service-type
-                                   px-desktop-polkit-settings)
-                                  (service-extension profile-service-type
-                                   px-desktop-profile-packages)))
-                (default-value (px-desktop-configuration))
-                (description "Run LXQt desktop environment on PantherX.")))
-
 ;;
 ;; allow netdev group to control network manger
 ;;
-- 
cgit v1.2.3