Index: guix/config-desktop.scm
===================================================================
--- guix/config-desktop.scm	(revision fde9de8aaab787061625952015d69db18c82c878)
+++ guix/config-desktop.scm	(revision fc6fa17a6ea1b781124c6d25243df97573d5c05f)
@@ -7,5 +7,5 @@
              (gnu home services shells))
 
-(use-service-modules guix cups desktop networking ssh xorg docker nix admin vnc lightdm syncthing virtualization databases)
+(use-service-modules guix cups desktop networking ssh xorg docker nix admin vnc lightdm syncthing virtualization databases linux)
 (use-package-modules gnome xdisorg vnc databases)
 
@@ -34,10 +34,4 @@
                 (home-directory "/home/w96k")
                 (supplementary-groups '("wheel" "netdev" "audio" "video" "docker")))
-	       (user-account
-                (name "wkz")
-                (comment "wkz")
-                (group "users")
-                (home-directory "/home/wkz")
-                (supplementary-groups '("wheel" "netdev" "audio" "video" "docker")))
                %base-user-accounts))
 
@@ -48,7 +42,5 @@
     specification->package
     '(
-      "ratpoison"
-      "xterm"
-      "screen"
+
       ))
    %base-packages))
@@ -61,4 +53,9 @@
 	   (service block-facebook-hosts-service-type)
 
+	   (service zram-device-service-type
+                            (zram-device-configuration
+                              (compression-algorithm 'zlib)
+                              (priority 100)))
+
 	   (service tor-service-type)
 	   (service openssh-service-type)
@@ -70,11 +67,10 @@
            ;;    (memory-size 1024)))
 	   
-	   (service nix-service-type (nix-configuration
-				      (extra-options '("--extra-experimental-features nix-command"))))
+	   ;; (service nix-service-type)
 
-	   (service xvnc-service-type (xvnc-configuration
-                                       (display-number 10)
-                                       (localhost? #f)
-                                       (geometry "1280x800")))
+	   ;; (service xvnc-service-type (xvnc-configuration
+           ;;                             (display-number 10)
+           ;;                             (localhost? #f)
+           ;;                             (geometry "1280x800")))
 
 	   (service syncthing-service-type
@@ -109,8 +105,12 @@
 			   (delete usb-modeswitch-service-type)
 			   (delete geoclue-service-type)
+			   ;;(delete elogind-service-type)
+			   (delete colord-service-type)
 			   
 			   
 			   (guix-service-type config => (guix-configuration
 							 (inherit config)
+							                                  ;; Rely on btrfs compression.
+							 (log-compression 'none)
 							 (extra-options '("--max-jobs=10"))
 							 (substitute-urls
@@ -131,25 +131,27 @@
 			   (delete gdm-service-type))))
 
+  (mapped-devices (list (mapped-device
+                          (source (uuid
+                                   "03db8d78-051b-4a11-a7e5-b62ae0f530d4"))
+                          (target "cryptroot")
+                          (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 "/")
+                         (device "/dev/mapper/cryptroot")
+                         (type "btrfs")
+			 (options "compress=zlib:6,autodefrag")
+                         (dependencies mapped-devices))
+                       (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid "6ECD-551F"
+                                       'fat32))
+                         (type "vfat")) %base-file-systems))
+ 
  (bootloader (bootloader-configuration
               (bootloader grub-efi-bootloader)
               (targets (list "/boot/efi"))
-              (keyboard-layout keyboard-layout)))
- (mapped-devices (list (mapped-device
-                        (source (uuid
-                                 "6cfe9eed-8cdd-43da-9b9f-cec6f8ec538b"))
-                        (target "cryptroot")
-                        (type luks-device-mapping))))
-
- (file-systems (cons* (file-system
-                       (mount-point "/boot/efi")
-                       (device (uuid "17C5-3E35"
-                                     'fat32))
-                       (type "vfat"))
-                      (file-system
-                       (mount-point "/")
-                       (device "/dev/mapper/cryptroot")
-                       (type "ext4")
-		       (options "discard")
-		       (skip-check-if-clean? #f)
-		       (repair #t)
-                       (dependencies mapped-devices)) %base-file-systems)))
+              (keyboard-layout keyboard-layout))))
