Cleanup and styling

metznet/services/sssd.scm

@@ -70,8 +70,7 @@
 
 (define-configuration sssd-configuration
   (sssd (file-like sssd) "sssd package to use")
-  (pam-services (list-of-strings (list "su" "sddm" "login" "sshd"
-                                       "passwd"))
+  (pam-services (list-of-strings (list "su" "sddm" "login" "sshd" "passwd"))
                 "list of pam services to configure login for"
                 (lambda (a b)
                   ""))
@@ -139,8 +138,11 @@
             (user (getpw "root")))
         (mkdir-p/perms dbusdir user 493)
         (mkdir-p/perms dbdir user 493)
-        (copy-file #$(sssd-configuration-file config) "/var/lib/sss/sssd.conf")
-        (chmod "/var/lib/sss/sssd.conf" #o600))))
+        (unless (file-exists? "/var/lib/sss/sssd.conf")
+          (begin
+            (copy-file #$(sssd-configuration-file config)
+                       "/var/lib/sss/sssd.conf")
+            (chmod "/var/lib/sss/sssd.conf" #o600))))))
 
 (define-public sssd-service-type
   (service-type (name 'sssd)

metznet/system/base-system.scm

@@ -234,12 +234,14 @@
   (sssd-configuration (domains (list (cons "metznet.ca"
                                            (sssd-domain-configuration (id_provider
                                                                        "ldap")
-                                                                      (debug_level "10")
+                                                                      (debug_level
+                                                                       "10")
                                                                       (auth_provider
                                                                        "ldap")
                                                                       (cache_credentials
                                                                        #t)
-                                                                      (ldap_schema "rfc2307bis")
+                                                                      (ldap_schema
+                                                                       "rfc2307bis")
                                                                       (ldap_group_member
                                                                        "member")
                                                                       (ldap_group_object_class
@@ -312,6 +314,7 @@
                                                                                 "")
                                                                                "dc=metznet,dc=ca"
 
+                                                                               
                                                                                (list-ref
                                                                                 (command-line)
                                                                                 1))
@@ -350,14 +353,14 @@
                                       %nscd-default-caches))))
 
 (define %metznet-desktop-services
-  (append %metznet-services (list (service sddm-service-type (sddm-configuration)))
+  (append %metznet-services
+          (list (service sddm-service-type
+                         (sddm-configuration)))
           (modify-services %desktop-services
             (delete gdm-service-type)
             (nscd-service-type config => %metznet-nscd-configuration)
             (network-manager-service-type config =>
-                                          (network-manager-configuration (inherit
-                                                                          config)
-                                                                         (vpn-plugins
+                                          (network-manager-configuration (vpn-plugins
                                                                           (list
                                                                            network-manager-openvpn)))))))