diff --git a/config.scm b/config.scm
index a31c245..08aa41a 100644
--- a/config.scm
+++ b/config.scm
@@ -1,12 +1,13 @@
 ;; -*- mode: guix-scheme -*-
 
-(use-modules (gnu)
-             (gnu services avahi)
-             (gnu services base)
-             (gnu services desktop)
-             (gnu services networking)
-             (gnu services pm)
-             (gnu system nss))
+(use-modules
+ (gnu)
+ (gnu services avahi)
+ (gnu services base)
+ (gnu services desktop)
+ (gnu services networking)
+ (gnu services pm)
+ (gnu system nss))
 
 (use-service-modules desktop)
 
@@ -21,99 +22,104 @@
  (host-name "ziltis-machine")
  (timezone "Europe/Berlin")
  (locale "de_DE.utf8")
- (bootloader (bootloader-configuration
-              (bootloader grub-efi-bootloader)
-              (targets '("/boot/efi"))
-              (keyboard-layout
-               (keyboard-layout "de"))))
- (file-systems (append
-                (list
-                 (file-system
-                  (device (partition-label "EFI System Partition"))
-                  (mount-point "/boot/efi")
-                  (type "vfat"))
-                 (file-system
-                  (device (file-system-label "guix-root")
-                          (mount-point "/")
-                          (type "xfs")))
-                 (file-system
-                  (device (label "swap"))
-                  (type "swap")))
-                %base-file-systems))
- (swap-devices (list
-                (swap-space
-                 (target (label "swap"))
-                 (discard? #t))))
- (keyboard-layout (keyboard-layout "de"))
- (users (cons (user-account
-               (name "zilti")
-               (group "users")
-               (supplementary-groups '("wheel"
-                                       "seat"
-                                       "audio"
-                                       "video"
-                                       "libvirt")))
-              %base-user-accounts))
- (packages (append
-            (list
-             nss-certs
-             emacs
-             emacs-desktop-environment
-             kitty
-             swayfx)
-            %base-packages))
-
- (services (append
-            (modify-services
-             %desktop-services
-             (delete login-service-type)
-             (delete mingetty-service-type))
-            (list (service avahi-service-type)
-
-                  (service elogind-service-type)
-                  (service seatd-service-type)
-                  (service polkit-service-type)
-                  (service polkit-wheel-service)
-                  (service upower-service-type)
-                  (service tlp-service-type)
-                  (service thermald-service-type
-                           (thermald-configuration
-                            (adaptive? #t)))
-                  (service udisks-service-type)
-                  (service bluetooth-service-type)
-                  (service inputattach-service-type)
-
-                  (service fstrim-service-type)
-
-                  (service earlyoom-service-type
-                           (earlyoom-configuration
-                            (minimum-available-memory 5)
-                            (minimum-free-swap 5)))
-
-                  (service greetd-service-type
-                           (greetd-configuration
-                            (greeter-supplementary-groups
-                             (list "video" "input" "seat"))
-                            (terminals
-                             (list (greetd-terminal-configuration
-                                    (terminal-vt "1")
-                                    (terminal-switch #t)
-                                    (default-session-command
-                                      (greetd-wlgreet-sway-session
-                                       (sway 'swayfx)
-                                       ;; (sway-configuration #f)
-                                       )))))))
-
-                  (service fprintd-service-type)
-
-                  (service screen-locker-service-type
-                           (screen-locker-configuration
-                            (name "swaylock")
-                            (program (file-append swaylock-effects "/bin/swaylock"))
-                            (using-setuid? #f)))
-
-                  (service libvirt-service-type
-                           (libvirt-configuration
-                            (unix-sock-group "libvirt"))))))
-
+ (bootloader
+  (bootloader-configuration
+   (bootloader grub-efi-bootloader)
+   (targets
+    '("/boot/efi"))
+   (keyboard-layout keyboard-layout)))
+ (file-systems
+  (cons*
+   (file-system
+    (device
+     (partition-label "EFI System Partition"))
+    (mount-point "/boot/efi")
+    (type "vfat"))
+   (file-system
+    (device
+     (file-system-label "guix-root")
+     (mount-point "/")
+     (type "xfs")))
+   %base-file-systems))
+ (swap-devices
+  (list
+   (swap-space
+    (target
+     (label "swap"))
+    (discard? #t))))
+ (keyboard-layout
+  (keyboard-layout "de"))
+ (users
+  (cons* (user-account
+          (name "zilti")
+          (group "users")
+          (supplementary-groups
+           '("wheel"
+             "seat"
+             "audio"
+             "video"
+             "libvirt")))
+   %base-user-accounts))
+ (packages
+  (append
+   (list
+    nss-certs
+    emacs
+    emacs-desktop-environment
+    kitty
+    swayfx)
+   %base-packages))
+ (services
+  (append
+   (modify-services
+    %desktop-services
+    (delete login-service-type)
+    (delete mingetty-service-type))
+   (list
+    (service network-manager-service-type)
+    (service wpa-supplicant-service-type)
+    (service ntp-service-type)
+    (service gdm-service-type)
+    (service avahi-service-type)
+    (service elogind-service-type)
+    (service seatd-service-type)
+    (service polkit-service-type)
+    (service polkit-wheel-service)
+    (service upower-service-type)
+    (service tlp-service-type)
+    (service thermald-service-type
+             (thermald-configuration
+              (adaptive? #t)))
+    (service udisks-service-type)
+    (service bluetooth-service-type)
+    (service inputattach-service-type)
+    (service fstrim-service-type)
+    (service earlyoom-service-type
+             (earlyoom-configuration
+              (minimum-available-memory 5)
+              (minimum-free-swap 5)))
+    (service greetd-service-type
+             (greetd-configuration
+              (greeter-supplementary-groups
+               (list "video" "input" "seat"))
+              (terminals
+               (list
+                (greetd-terminal-configuration
+                 (terminal-vt "1")
+                 (terminal-switch #t)
+                 (default-session-command
+                   (greetd-wlgreet-sway-session
+                    (sway 'swayfx)
+                    ;; (sway-configuration #f)
+                    )))))))
+    (service fprintd-service-type)
+    (service screen-locker-service-type
+             (screen-locker-configuration
+              (name "swaylock")
+              (program
+               (file-append swaylock-effects "/bin/swaylock"))
+              (using-setuid? #f)))
+    (service libvirt-service-type
+             (libvirt-configuration
+              (unix-sock-group "libvirt"))))))
  (name-service-switch %mdns-host-lookup-nss))