From 77fc57c04f75aa185f641a9c3db37491b6485324 Mon Sep 17 00:00:00 2001
From: Franz Geffke <franz@pantherx.org>
Date: Wed, 27 Dec 2023 15:21:35 +0000
Subject: export new package and service set #2

---
 px/packages/base.scm    | 4 ++--
 px/services/base.scm    | 8 ++++----
 px/services/desktop.scm | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/px/packages/base.scm b/px/packages/base.scm
index da1ad3f..d6b3f52 100644
--- a/px/packages/base.scm
+++ b/px/packages/base.scm
@@ -25,7 +25,7 @@
   #:use-module (px packages setup)
   #:use-module (px packages themes)
   #:export (%px-core-packages
-            %px-desktop-packages-core
+            %px-desktop-core-packages
             %px-desktop-packages-gtk
             %px-desktop-packages-qt
             %px-desktop-packages
@@ -53,7 +53,7 @@
 ;;;
 
 ;; Stuff for every desktop; QT / GTK on X / Wayland
-(define %px-desktop-packages-core
+(define %px-desktop-core-packages
   (append %common-desktop-applications
 		  %px-core-packages))
 
diff --git a/px/services/base.scm b/px/services/base.scm
index 85cef19..fe0716e 100644
--- a/px/services/base.scm
+++ b/px/services/base.scm
@@ -61,10 +61,10 @@
 ;;;
 
 (define %px-desktop-core-services
-  (append %desktop-services-plain))
+  (append %desktop-services-assembly-plain))
 
 (define %px-desktop-services
-  (append %desktop-services))
+  (append %desktop-services-assembly))
 
 ;;;
 ;;;
@@ -76,7 +76,7 @@
   ;; TODO: Does not include default desktop
   (append (list (service px-device-identity-service-type)
                 (service px-user-identity-service-type))
-				%desktop-services))
+				%desktop-services-assembly))
 
 ;;;
 ;;; SERVER
@@ -147,5 +147,5 @@
   (append (list (service dhcp-client-service-type)
                 (service sddm-service-type
                          (sddm-configuration (minimum-uid 1000))))
-          (modify-services %desktop-services
+          (modify-services %desktop-services-assembly
             (delete network-manager-service-type))))
diff --git a/px/services/desktop.scm b/px/services/desktop.scm
index 1348adf..57ca40c 100644
--- a/px/services/desktop.scm
+++ b/px/services/desktop.scm
@@ -44,8 +44,8 @@
 
             create-swap-space-service
 
-            %desktop-services
-		    %desktop-services-plain))
+            %desktop-services-assembly
+		    %desktop-services-assembly-plain))
 
 ;;
 ;; allow netdev group to control network manger
@@ -256,7 +256,7 @@
 
          %base-services))
 
-(define-syntax %desktop-services
+(define-syntax %desktop-services-assembly
   (identifier-syntax (desktop-services-for-system)))
 
 ;; Generic Desktop for use with other locker's and DE's; for ex. Sway on Wayland
@@ -358,5 +358,5 @@
 
          %base-services))
 
-(define-syntax %desktop-services-plain
+(define-syntax %desktop-services-assembly-plain
   (identifier-syntax (desktop-services-for-system-plain)))
-- 
cgit v1.2.3