diff --git a/laptop/system.scm b/laptop/system.scm
index 158f858..dbefe02 100644
--- a/laptop/system.scm
+++ b/laptop/system.scm
@@ -24,99 +24,99 @@
   (swap-devices (list (swap-space (target "/swapfile"))))
 
   ;; The list of user accounts ('root' is implicit).
-  (users (cons* (user-account
-                  (name "bartronx7")
-                  (comment "Bart")
-                  (group "users")
-                  (home-directory "/home/bartronx7")
-                  (shell #~(string-append #$zsh "/bin/zsh"))
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
-                (user-account
-                  (name "kate")
-                  (comment "Kate")
-                  (group "users")
-                  (home-directory "/home/kate")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
-                (user-account
-                  (name "emma")
-                  (comment "Emma")
-                  (group "users")
-                  (home-directory "/home/emma")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
-                (user-account
-                  (name "claire")
-                  (comment "Claire")
-                  (group "users")
-                  (home-directory "/home/claire")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
-                %base-user-accounts))
+  (users
+    (cons*
+      (user-account
+        (name "bartronx7")
+        (comment "Bart")
+        (group "users")
+        (home-directory "/home/bartronx7")
+        (shell #~(string-append #$zsh "/bin/zsh"))
+        (supplementary-groups '("wheel" "netdev" "audio" "video")))
+      (user-account
+        (name "kate")
+        (comment "Kate")
+        (group "users")
+        (home-directory "/home/kate")
+        (supplementary-groups '("wheel" "netdev" "audio" "video")))
+      (user-account
+        (name "emma")
+        (comment "Emma")
+        (group "users")
+        (home-directory "/home/emma")
+        (supplementary-groups '("wheel" "netdev" "audio" "video")))
+      (user-account
+        (name "claire")
+        (comment "Claire")
+        (group "users")
+        (home-directory "/home/claire")
+        (supplementary-groups '("wheel" "netdev" "audio" "video")))
+      %base-user-accounts))
 
   ;; Packages installed system-wide.  Users can also install packages
   ;; under their own account: use 'guix search KEYWORD' to search
   ;; for packages and 'guix install PACKAGE' to install a package.
-  (packages (append (list (specification->package "dmenu")
-                          (specification->package "st")
-                          (specification->package "firefox")
-                          (specification->package "libreoffice")
-                          (specification->package "git")
-                          (specification->package "curl")
-                          (specification->package "rust")
-                          (specification->package "zsh")
-                          (specification->package "unzip")) %base-packages))
+  (packages
+    (append
+      (map specification->package (list
+        "dmenu"
+        "st"
+        "firefox"
+        "libreoffice"
+        "git"
+        "curl"
+        "rust"
+        "zsh"
+        "unzip"))
+      %base-packages))
 
   ;; Below is the list of system services.  To search for available
   ;; services, run 'guix system search KEYWORD' in a terminal.
   (services
-   (append (list (service gnome-desktop-service-type)
+   (append
+     %desktop-services
+     (list
+       (service gnome-desktop-service-type)
+        (service bluetooth-service-type
+          (bluetooth-configuration
+            (fast-connectable? #t)
+            (auto-enable? #t)))
+        (service openssh-service-type)
+        (service tor-service-type)
+        (service cups-service-type
+          (cups-configuration
+            (web-interface? #t)))
+        (set-xorg-configuration (xorg-configuration (keyboard-layout keyboard-layout))))))
 
-                 ;; To configure OpenSSH, pass an 'openssh-configuration'
-                 ;; record as a second argument to 'service' below.
-                 (service bluetooth-service-type 
-                   (bluetooth-configuration
-                     (fast-connectable? #t)
-                     (auto-enable? #t)))
-                 (service openssh-service-type)
-                 (service tor-service-type)
-                 (service cups-service-type 
-                   (cups-configuration 
-                     (web-interface? #t)))
-                 (set-xorg-configuration
-                  (xorg-configuration (keyboard-layout keyboard-layout))))
+  (bootloader
+    (bootloader-configuration
+      (bootloader grub-efi-bootloader)
+      (targets (list "/boot/efi"))
+      (keyboard-layout keyboard-layout)))
 
-           ;; This is the default list of services we
-           ;; are appending to.
-           %desktop-services))
-  (bootloader (bootloader-configuration
-                (bootloader grub-efi-bootloader)
-                (targets (list "/boot/efi"))
-                (keyboard-layout keyboard-layout)))
-  (mapped-devices (list (mapped-device
-                          (source (uuid
-                                   "b619e349-c462-4652-9b30-ae00d687f604"))
-                          (target "cryptroot")
-                          (type luks-device-mapping))
-                        (mapped-device
-                          (source (uuid
-                                   "b6595ebc-8b65-4771-b2cf-682d5c9dc3c3"))
-                          (target "crypthome")
-                          (type luks-device-mapping))))
+  (mapped-devices
+    (list
+      (mapped-device
+        (source (uuid "b6595ebc-8b65-4771-b2cf-682d5c9dc3c3"))
+        (target "crypthome")
+        (type luks-device-mapping))))
 
   ;; The list of file systems that get "mounted".  The unique
   ;; file system identifiers there ("UUIDs") can be obtained
   ;; by running 'blkid' in a terminal.
-  (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid "8864-46B5"
-                                       'fat32))
-                         (type "vfat"))
-                       (file-system
-                         (mount-point "/")
-                         (device "/dev/mapper/cryptroot")
-                         (type "ext4")
-                         (dependencies mapped-devices))
-                       (file-system
-                         (mount-point "/home")
-                         (device "/dev/mapper/crypthome")
-                         (type "ext4")
-                         (dependencies mapped-devices))
-                       %base-file-systems)))
+  (file-systems
+    (cons*
+      (file-system
+        (mount-point "/boot/efi")
+        (device (uuid "8864-46B5" 'fat32))
+        (type "vfat"))
+      (file-system
+        (mount-point "/")
+        (device (uuid "b6595ebc-8b65-4771-b2cf-682d5c9dc3c3"))
+        (type "btrfs"))
+      (file-system
+        (mount-point "/home")
+        (device "/dev/mapper/crypthome")
+        (type "btrfs")
+        (dependencies mapped-devices))
+      %base-file-systems)))