12 files changed, 39 insertions, 21 deletions
diff --git a/px/services/base.scm b/px/services/base.scm
index 93a71bb..ad04ab1 100644
--- a/px/services/base.scm
+++ b/px/services/base.scm
@@ -1,9 +1,6 @@
-;;; PantherX System Configuration Module
-;;; This module supports configuration modules for PantherX OS definitions
-;;;
-;;; Reza Alizadeh Majd <r.majd@pantherx.org>
-;;; Franz Geffke <franz@pantherx.org>
-;;;
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2023 Reza Alizadeh Majd <r.majd@pantherx.org>
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
 
 (define-module (px services base)
   #:use-module (guix gexp)
diff --git a/px/services/bluetooth.scm b/px/services/bluetooth.scm
index 2c2dbe6..6976c7d 100644
--- a/px/services/bluetooth.scm
+++ b/px/services/bluetooth.scm
@@ -1,3 +1,6 @@
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
+
 (define-module (px services bluetooth)
   #:use-module (gnu)
   #:use-module (gnu packages admin)
diff --git a/px/services/desktop.scm b/px/services/desktop.scm
index 15e08cf..079c49b 100644
--- a/px/services/desktop.scm
+++ b/px/services/desktop.scm
@@ -1,6 +1,6 @@
-;;; Desktop service definitions for PantherX
-;;; Reza Alizadeh Majd <r.majd@pantherx.org>
-;;; Franz Geffke <franz@pantherx.org>
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2023 Reza Alizadeh Majd <r.majd@pantherx.org>
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
 
 (define-module (px services desktop)
   #:use-module (gnu packages admin)
@@ -167,12 +167,10 @@
 
          ;; Allow desktop users to also mount NTFS and NFS file systems
          ;; without root.
-         (simple-service 'mount-setuid-helpers setuid-program-service-type
-                         (map (lambda (program)
-                                (setuid-program
-                                  (program program)))
+         (simple-service 'mount-setuid-helpers privileged-program-service-type
+                         (map file-like->setuid-program
                               (list (file-append nfs-utils "/sbin/mount.nfs")
-                                    (file-append ntfs-3g "/sbin/mount.ntfs-3g"))))
+                               (file-append ntfs-3g "/sbin/mount.ntfs-3g"))))
 
          ;; This is a volatile read-write file system mounted at /var/lib/gdm,
          ;; to avoid GDM stale cache and permission issues.
diff --git a/px/services/device.scm b/px/services/device.scm
index e00fc4a..0014733 100644
--- a/px/services/device.scm
+++ b/px/services/device.scm
@@ -1,3 +1,6 @@
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
+
 (define-module (px services device)
   #:use-module (guix gexp)
   #:use-module (guix records)
diff --git a/px/services/disk.scm b/px/services/disk.scm
index abbd7cb..0e2e5ad 100644
--- a/px/services/disk.scm
+++ b/px/services/disk.scm
@@ -1,8 +1,6 @@
-;;; Desktop service definitions for PantherX
-;;;
-;;; Reza Alizadeh Majd <r.majd@pantherx.org>
-;;; Franz Geffke <franz@pantherx.org>
-;;;
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2023 Reza Alizadeh Majd <r.majd@pantherx.org>
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
 
 (define-module (px services disk)
   #:use-module (gnu packages admin)
diff --git a/px/services/log.scm b/px/services/log.scm
index cf0475a..72efcb6 100644
--- a/px/services/log.scm
+++ b/px/services/log.scm
@@ -1,3 +1,6 @@
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
+
 (define-module (px services log)
   #:use-module (gnu)
   #:use-module (gnu packages admin)
diff --git a/px/services/monitoring.scm b/px/services/monitoring.scm
index 7beeb07..6f7efd4 100644
--- a/px/services/monitoring.scm
+++ b/px/services/monitoring.scm
@@ -1,3 +1,6 @@
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
+
 (define-module (px services monitoring)
   #:use-module (gnu)
   #:use-module (gnu packages base)
diff --git a/px/services/networking.scm b/px/services/networking.scm
index 05de25d..15aab62 100644
--- a/px/services/networking.scm
+++ b/px/services/networking.scm
@@ -1,3 +1,6 @@
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
+
 (define-module (px services networking)
   #:use-module (gnu)
   #:use-module (gnu packages admin)
diff --git a/px/services/ntp.scm b/px/services/ntp.scm
index fd5bc24..5d51a30 100644
--- a/px/services/ntp.scm
+++ b/px/services/ntp.scm
@@ -1,3 +1,6 @@
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
+
 (define-module (px services ntp)
   #:use-module (gnu)
   #:use-module (gnu packages admin)
diff --git a/px/services/package-management.scm b/px/services/package-management.scm
index 1550826..b999063 100644
--- a/px/services/package-management.scm
+++ b/px/services/package-management.scm
@@ -1,3 +1,6 @@
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
+
 (define-module (px services package-management)
   #:use-module (gnu)
   #:use-module (gnu packages bash)
diff --git a/px/services/security-token.scm b/px/services/security-token.scm
index 99d6c69..7afbbdf 100644
--- a/px/services/security-token.scm
+++ b/px/services/security-token.scm
@@ -1,5 +1,6 @@
-;;; module for security tokens and hardware wallet related services
-;;; Reza Alizadeh Majd (r.majd@pantherx.org)
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2023 Reza Alizadeh Majd <r.majd@pantherx.org>
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
 
 (define-module (px services security-token)
   #:use-module (gnu services base)
diff --git a/px/services/server.scm b/px/services/server.scm
index 7f4d5c7..e7e0324 100644
--- a/px/services/server.scm
+++ b/px/services/server.scm
@@ -1,3 +1,6 @@
+;;; Package Repository for GNU Guix
+;;; Copyright © 2021-2025 Franz Geffke <m@f-a.nz>
+
 (define-module (px services server)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages node)