rewrite: apply guix-reference formatting; cleanup some module imports

1 files changed, 169 insertions, 176 deletions

diff --git a/px/services/desktop.scm b/px/services/desktop.scm
index 1274126..3b80aa5 100644
--- a/px/services/desktop.scm
+++ b/px/services/desktop.scm
@@ -1,8 +1,6 @@
 ;;; Desktop service definitions for PantherX
-;;;
 ;;; Reza Alizadeh Majd <r.majd@pantherx.org>
 ;;; Franz Geffke <franz@pantherx.org>
-;;;
 
 (define-module (px services desktop)
   #:use-module (gnu packages admin)
@@ -38,7 +36,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (guix utils)
   #:use-module (ice-9 match)
-  #:export (px-desktop-configuration
+  #:export (px-desktop-configuration 
             px-desktop-configuration?
             px-desktop-service-type
 
@@ -46,7 +44,7 @@
             polkit-elogind-service
 
             create-swap-space-service
-            
+
             %px-desktop-services-base))
 
 ;;
@@ -54,7 +52,7 @@
 ;;
 
 (define-record-type* <px-desktop-configuration> px-desktop-configuration
-  make-px-desktop-configuration
+                     make-px-desktop-configuration
   px-desktop-configuration?
   (lxqt px-config-package
         (default lxqt-modified))
@@ -68,44 +66,38 @@ rules."
 
 (define px-desktop-profile-packages
   (lambda (config)
-    (append 
-      (list (px-config-package config))
-      (px-config-default-packages 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.")))
+  (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
 ;;
 
 (define polkit-network-manager
-  (file-union
-   "polkit-nm"
-   `(("share/polkit-1/rules.d/50-org.freedesktop.NetworkManager.rules"
-      ,(plain-file
-        "nm.rules"
-        "polkit.addRule(function(action, subject) {
+  (file-union "polkit-nm"
+              `(("share/polkit-1/rules.d/50-org.freedesktop.NetworkManager.rules" ,
+                 (plain-file "nm.rules"
+                  "polkit.addRule(function(action, subject) {
   if (action.id.indexOf(\"org.freedesktop.NetworkManager.\") == 0 && subject.isInGroup(\"netdev\")) {
     return polkit.Result.YES;
   }
 });
 ")))))
 
-
 ;; primarily for ARM
 
 (define polkit-network-manager-service
-  (simple-service 'polkit-nm polkit-service-type (list polkit-network-manager)))
+  (simple-service 'polkit-nm polkit-service-type
+                  (list polkit-network-manager)))
 
 ;;
 ;; Allow users group to perform reboot/poweroff
@@ -113,12 +105,10 @@ rules."
 ;;
 
 (define polkit-loginctl
-  (file-union
-   "polkit-loginctl"
-   `(("share/polkit-1/rules.d/10-enable-session-power.rules"
-      ,(plain-file
-        "login.rules"
-        "polkit.addRule(function(action, subject) {
+  (file-union "polkit-loginctl"
+              `(("share/polkit-1/rules.d/10-enable-session-power.rules" ,(plain-file
+                                                                          "login.rules"
+                                                                          "polkit.addRule(function(action, subject) {
   if ( (action.id == \"org.freedesktop.login1.reboot\" ||
         action.id == \"org.freedesktop.login1.reboot-multiple-sessions\" ||
         action.id == \"org.freedesktop.login1.power-off\" ||
@@ -130,167 +120,170 @@ rules."
 ")))))
 
 (define polkit-elogind-service
-  (simple-service 'polkit-login polkit-service-type (list polkit-loginctl)))
+  (simple-service 'polkit-login polkit-service-type
+                  (list polkit-loginctl)))
 
 (define (make-firewall-rules open-ports)
-
+  
   (define (make-port-rules open-ports status)
     "Generate list of strings each is a port/service rule for nftables"
-    (reduce-right append '()
+    (reduce-right append
+                  '()
                   (map (match-lambda
                          ((protocol ports ...)
                           (map (lambda (port)
-                                 (string-append "    " protocol " dport " port " " status))
-                               ports)))
-                       open-ports)))
+                                 (string-append "    "
+                                                protocol
+                                                " dport "
+                                                port
+                                                " "
+                                                status)) ports))) open-ports)))
 
   (let ((port-rules (make-port-rules open-ports "accept")))
     (plain-file "nftables"
                 (string-append "#PantherX firewall rules\n"
-                               "table inet filter {\n"
-                               "  chain input {\n"
-                               "    type filter hook input priority 0; policy drop;\n"
-                               "    # early drop of invalid connections\n"
-                               "    ct state invalid drop\n"
-                               "    # allow established/related connections\n"
-                               "    ct state { established, related } accept\n"
-                               "    # allow from loopback\n"
-                               "    iifname lo accept\n"
-                               "    # allow icmp\n"
-                               "    ip protocol icmp accept\n"
-                               "    ip6 nexthdr icmpv6 accept\n"
-                               (string-join port-rules "\n" 'suffix)
-                               "    # reject everything else\n"
-                               "    reject with icmpx type port-unreachable\n"
-                               "  }\n"
-                               "  chain forward {\n"
-                               "    type filter hook forward priority 0; policy drop;\n"
-                               "  }\n"
-                               "  chain output {\n"
-                               "    type filter hook output priority 0; policy accept;\n"
-                               "  }\n"
-                               "}\n"))))
-
-
-(define* (desktop-services-for-system #:optional
-                                      (system (or (%current-target-system)
-                                                  (%current-system))))
+                 "table inet filter {\n"
+                 "  chain input {\n"
+                 "    type filter hook input priority 0; policy drop;
+"
+                 "    # early drop of invalid connections\n"
+                 "    ct state invalid drop\n"
+                 "    # allow established/related connections
+"
+                 "    ct state { established, related } accept
+"
+                 "    # allow from loopback\n"
+                 "    iifname lo accept\n"
+                 "    # allow icmp\n"
+                 "    ip protocol icmp accept\n"
+                 "    ip6 nexthdr icmpv6 accept\n"
+                 (string-join port-rules "\n"
+                              'suffix)
+                 "    # reject everything else\n"
+                 "    reject with icmpx type port-unreachable
+"
+                 "  }\n"
+                 "  chain forward {\n"
+                 "    type filter hook forward priority 0; policy drop;
+"
+                 "  }\n"
+                 "  chain output {\n"
+                 "    type filter hook output priority 0; policy accept;
+"
+                 "  }\n"
+                 "}\n"))))
+
+(define* (desktop-services-for-system #:optional (system (or (%current-target-system)
+                                                             (%current-system))))
   ;; List of services typically useful for a "desktop" use case.
-
+  
   ;; Since GDM depends on Rust (gdm -> gnome-shell -> gjs -> mozjs -> rust)
   ;; and Rust is currently unavailable on non-x86_64 platforms, default to
   ;; SDDM there (FIXME).
-  (cons*  (service screen-locker-service-type
-            (screen-locker-configuration
-              (name "xlock")
-              (program (file-append xlockmore "/bin/xlock"))))
-
-          ;; Add udev rules for MTP devices so that non-root users can access
-          ;; them.
-          (simple-service 'mtp udev-service-type (list libmtp))
-          ;; Add udev rules for scanners.
-          (service sane-service-type)
-          ;; Add polkit rules, so that non-root users in the wheel group can
-          ;; perform administrative tasks (similar to "sudo").
-          polkit-wheel-service
-
-          ;; 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
+  (cons* (service screen-locker-service-type
+                  (screen-locker-configuration (name "xlock")
+                                               (program (file-append xlockmore
+                                                         "/bin/xlock"))))
+
+         ;; Add udev rules for MTP devices so that non-root users can access
+         ;; them.
+         (simple-service 'mtp udev-service-type
+                         (list libmtp))
+         ;; Add udev rules for scanners.
+         (service sane-service-type)
+         ;; Add polkit rules, so that non-root users in the wheel group can
+         ;; perform administrative tasks (similar to "sudo").
+         polkit-wheel-service
+
+         ;; 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)))
-                                (list (file-append nfs-utils "/sbin/mount.nfs")
-                                (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.
-          gdm-file-system-service
-
-          ;; The global fontconfig cache directory can sometimes contain
-          ;; stale entries, possibly referencing fonts that have been GC'd,
-          ;; so mount it read-only.
-          fontconfig-file-system-service
-
-          ;; NetworkManager and its applet.
-          (service network-manager-service-type)
-          (service wpa-supplicant-service-type)    ;needed by NetworkManager
-          (simple-service 'network-manager-applet
-                          profile-service-type
-                          (list network-manager-applet))
-          (service modem-manager-service-type)
-          (service usb-modeswitch-service-type)
-
-          ;; The D-Bus clique.
-          (service avahi-service-type)
-          (service udisks-service-type)
-          (service upower-service-type)
-          (service accountsservice-service-type)
-          (service cups-pk-helper-service-type)
-          (service colord-service-type)
-          (service geoclue-service-type)
-          (service polkit-service-type)
-          (service elogind-service-type)
-          (service dbus-root-service-type)
-
-          (service ntp-service-type)
-
-          (service x11-socket-directory-service-type)
-
-          (service pulseaudio-service-type)
-          (service alsa-service-type)
-
-          ;; PantherX Specific
-          (simple-service 'custom-udev-rules
-                      udev-service-type
-                      (list libu2f-host))
-
-          (ledger-wallet-service)
-          (nitro-key-service)
-
-          ;; Power savings
-          (service tlp-service-type)
-
-          ;; Bluetooth service
-          ;; (bluetooth-service #:auto-enable? #t)
-          (service bluetooth-service-type
-                  (bluetooth-configuration
-                    (auto-enable? #t)))
-
-          ;; Prevent overheating
-          ;; TLP does not conflict with thermald.
-          (service thermald-service-type)
-
-          ; Display manager
-          (service sddm-service-type
-                  (sddm-configuration
-                    (minimum-uid 1000)
-                    (theme "px-sddm-theme")))
-
-          ;; Printing
-          (service cups-service-type
-                  (cups-configuration
-                    (web-interface? #t)
-                    (browsing? #t)
-                    (default-paper-size "a4")))
-
-          ;; Keychain
-          (service gnome-keyring-service-type
-                  (gnome-keyring-configuration
-                    (pam-services '(("passwd" . passwd)
-                                    ("sddm" . login)))))
-
-          ;; SSH is enabled by default but only with SSH key
-          (service openssh-service-type
-                  (openssh-configuration
-                    (permit-root-login 'prohibit-password)))
-
-          ;; Firewall
-          (service nftables-service-type
-                  (nftables-configuration
-                    (ruleset (make-firewall-rules '()))))
+                              (list (file-append nfs-utils "/sbin/mount.nfs")
+                                    (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.
+         gdm-file-system-service
+
+         ;; The global fontconfig cache directory can sometimes contain
+         ;; stale entries, possibly referencing fonts that have been GC'd,
+         ;; so mount it read-only.
+         fontconfig-file-system-service
+
+         ;; NetworkManager and its applet.
+         (service network-manager-service-type)
+         (service wpa-supplicant-service-type) ;needed by NetworkManager
+         (simple-service 'network-manager-applet profile-service-type
+                         (list network-manager-applet))
+         (service modem-manager-service-type)
+         (service usb-modeswitch-service-type)
+
+         ;; The D-Bus clique.
+         (service avahi-service-type)
+         (service udisks-service-type)
+         (service upower-service-type)
+         (service accountsservice-service-type)
+         (service cups-pk-helper-service-type)
+         (service colord-service-type)
+         (service geoclue-service-type)
+         (service polkit-service-type)
+         (service elogind-service-type)
+         (service dbus-root-service-type)
+
+         (service ntp-service-type)
+
+         (service x11-socket-directory-service-type)
+
+         (service pulseaudio-service-type)
+         (service alsa-service-type)
+
+         ;; PantherX Specific
+         (simple-service 'custom-udev-rules udev-service-type
+                         (list libu2f-host))
+
+         (ledger-wallet-service)
+         (nitro-key-service)
+
+         ;; Power savings
+         (service tlp-service-type)
+
+         ;; Bluetooth service
+         ;; (bluetooth-service #:auto-enable? #t)
+         (service bluetooth-service-type
+                  (bluetooth-configuration (auto-enable? #t)))
+
+         ;; Prevent overheating
+         ;; TLP does not conflict with thermald.
+         (service thermald-service-type)
+
+         ;; Display manager
+         (service sddm-service-type
+                  (sddm-configuration (minimum-uid 1000)
+                                      (theme "px-sddm-theme")))
+
+         ;; Printing
+         (service cups-service-type
+                  (cups-configuration (web-interface? #t)
+                                      (browsing? #t)
+                                      (default-paper-size "a4")))
+
+         ;; Keychain
+         (service gnome-keyring-service-type
+                  (gnome-keyring-configuration (pam-services '(("passwd" . passwd)
+                                                               ("sddm" . login)))))
+
+         ;; SSH is enabled by default but only with SSH key
+         (service openssh-service-type
+                  (openssh-configuration (permit-root-login 'prohibit-password)))
+
+         ;; Firewall
+         (service nftables-service-type
+                  (nftables-configuration (ruleset (make-firewall-rules '()))))
 
          %base-services))
 
 (define-syntax %px-desktop-services-base
-  (identifier-syntax (desktop-services-for-system)))
\ No newline at end of file
+  (identifier-syntax (desktop-services-for-system)))