diff --git a/config.org b/config.org
index e039cb8..8f73cc1 100644
--- a/config.org
+++ b/config.org
@@ -44,21 +44,6 @@ There are many community modules at [[https://whereis.みんな/][Whereis]].
 #+NAME: module-list
 - gnu
 - gnu image
-- gnu services admin
-- gnu services authentication
-- gnu services base
-- gnu services configuration
-- gnu services dbus
-- gnu services desktop
-- gnu services docker
-- gnu services linux
-- gnu services networking
-- gnu services nix
-- gnu services pm
-- gnu services sddm
-- gnu services sound
-- gnu services virtualization
-- gnu services xorg
 - gnu system nss
 - rosenthal packages wm
 - zilti packages sway
@@ -76,7 +61,20 @@ There are many community modules at [[https://whereis.みんな/][Whereis]].
 ** Service Modules
 
 #+NAME: service-module-list
+- admin
+- authentication
+- base
+- configuration
+- dbus
 - desktop
+- docker
+- linux
+- networking
+- nix
+- pm
+- sddm
+- sound
+- virtualization
 - xorg
 
 #+begin_src scheme :noweb yes :exports none :results output :tangle config.scm
@@ -228,14 +226,13 @@ This adds the Nonguix channel.
     <<root-simple-service-block>>
     (list polkit-wheel-service)
     #;(list
-     <<greeter-service>>)
+    <<greeter-service>>)
     (list
      <<screen-lock-service>>)
     (list
      <<hosts-file-service>>)
     (list
-     <<unattended-upgrade>>)
-    ))
+     <<unattended-upgrade>>)))
 #+end_src
 
 *** Simple Services
diff --git a/config.scm b/config.scm
index a567c80..7a4108b 100644
--- a/config.scm
+++ b/config.scm
@@ -1,21 +1,6 @@
 (use-modules
   (gnu)
   (gnu image)
-  (gnu services admin)
-  (gnu services authentication)
-  (gnu services base)
-  (gnu services configuration)
-  (gnu services dbus)
-  (gnu services desktop)
-  (gnu services docker)
-  (gnu services linux)
-  (gnu services networking)
-  (gnu services nix)
-  (gnu services pm)
-  (gnu services sddm)
-  (gnu services sound)
-  (gnu services virtualization)
-  (gnu services xorg)
   (gnu system nss)
   (rosenthal packages wm)
   (zilti packages sway)
@@ -24,7 +9,22 @@
   (nongnu packages linux)
   (nongnu system linux-initrd))
 
-(use-service-modules desktop xorg)
+(use-service-modules
+  admin
+  authentication
+  base
+  configuration
+  dbus
+  desktop
+  docker
+  linux
+  networking
+  nix
+  pm
+  sddm
+  sound
+  virtualization
+  xorg)
 
 (use-package-modules
   bootloaders
@@ -160,29 +160,29 @@
     
     (list polkit-wheel-service)
     #;(list
-     (service greetd-service-type
-              (greetd-configuration
-               (greeter-supplementary-groups
-                (list "video" "input"))
-               (terminals
-                (list
-                 (greetd-terminal-configuration
-                  (terminal-vt "1"))
-                 (greetd-terminal-configuration
-                  (terminal-vt "2"))
-                 (greetd-terminal-configuration
-                  (terminal-vt "3"))
-                 (greetd-terminal-configuration
-                  (terminal-vt "4"))
-                 #;(greetd-terminal-configuration
-                 (terminal-vt "7")
-                 (terminal-switch #t)
-                 (default-session-command
-                 (greetd-wlgreet-session
-                 (command
-                 (file-append swayfx "/bin/sway")))))
-                 (greetd-terminal-configuration
-                  (terminal-vt "8")))))))
+    (service greetd-service-type
+             (greetd-configuration
+              (greeter-supplementary-groups
+               (list "video" "input"))
+              (terminals
+               (list
+                (greetd-terminal-configuration
+                 (terminal-vt "1"))
+                (greetd-terminal-configuration
+                 (terminal-vt "2"))
+                (greetd-terminal-configuration
+                 (terminal-vt "3"))
+                (greetd-terminal-configuration
+                 (terminal-vt "4"))
+                #;(greetd-terminal-configuration
+                (terminal-vt "7")
+                (terminal-switch #t)
+                (default-session-command
+                (greetd-wlgreet-session
+                (command
+                (file-append swayfx "/bin/sway")))))
+                (greetd-terminal-configuration
+                 (terminal-vt "8")))))))
     (list
      (service screen-locker-service-type
               (screen-locker-configuration
@@ -236,6 +236,5 @@
                     "2aa768893d7da14d9831d45e6f1b1625240ff222"
                     (openpgp-fingerprint
                      "37F6 55BA F43B C0FF 300A  91A1 B389 76E8 2C9D AE42")))))
-               )))))
-    ))
+               )))))))
  (name-service-switch %mdns-host-lookup-nss))