1 files changed, 5 insertions, 6 deletions

diff --git a/system.scm b/system.scm
index 1934685..2aa58d6 100644
--- a/system.scm
+++ b/system.scm
@@ -19,7 +19,7 @@
 (use-modules (gnu packages tls))
 (use-modules (srfi srfi-1))
 (use-package-modules security-token)
-(use-service-modules cups desktop networking ssh sound security-token docker)
+(use-service-modules cups desktop networking xorg ssh sound security-token docker)
 
 ; Define package that installs my root ca public keys
 (define my-ca-certs
@@ -141,9 +141,7 @@
                  (service pcscd-service-type)
                  (service docker-service-type)
                  (service bluetooth-service-type)
-                 (udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))
-                 (set-xorg-configuration
-                  (xorg-configuration (keyboard-layout keyboard-layout))))
+                 (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
 
            ;; This is the default list of services we
            ;; are appending to.
@@ -167,8 +165,9 @@
                   (inherit config)
                   (rules (cons %backlight-udev-rule
                                (udev-configuration-rules config)))))
-    (delete pulseaudio-service-type)
-    (delete gdm-service-type) )))
+    (delete pulseaudio-service-type) 
+    (delete gdm-service-type)
+    (delete xorg-server-service-type) )))
   (setuid-programs
     (append (list (file-like->setuid-program
                     (file-append