1 files changed, 20 insertions, 25 deletions

diff --git a/configuration.scm b/configuration.scm
index 10c2023..9c5dd63 100644
--- a/configuration.scm
+++ b/configuration.scm
@@ -6,8 +6,7 @@
    (mount-point "/")
    (needed-for-boot? #t)
    (device "tmpfs")
-   (type "tmpfs")
-   (check? #f)))
+   (type "tmpfs")))
 
 (define gnufs
   (file-system
@@ -16,34 +15,33 @@
    (create-mount-point? #t)
    (type "btrfs")
    (device (file-system-label "root"))
-   (options "subvol=/gnu,compress=zstd,discard=async")))
+   (options "subvol=/gnu,compress=zstd")))
 
-(define persistfs
+(define etcfs
   (file-system
-   (mount-point "/persist")
+   (mount-point "/etc")
    (needed-for-boot? #t)
    (create-mount-point? #t)
    (type "btrfs")
    (device (file-system-label "root"))
-   (options "subvol=/persist,compress=zstd,discard=async")))
+   (options "subvol=/gnu/etc,compress=zstd")))
 
-(define etcfs
+(define varfs
   (file-system
-   (mount-point "/etc")
+   (mount-point "/var")
    (needed-for-boot? #t)
    (create-mount-point? #t)
    (type "btrfs")
    (device (file-system-label "root"))
-   (options "subvol=/persist/etc,compress=zstd,discard=async")))
+   (options "subvol=/gnu/var,compress=zstd")))
 
-(define varfs
+(define persistfs
   (file-system
-   (mount-point "/var")
-   (needed-for-boot? #t)
+   (mount-point "/persist")
    (create-mount-point? #t)
    (type "btrfs")
    (device (file-system-label "root"))
-   (options "subvol=/persist/var,compress=zstd,discard=async")))
+   (options "subvol=/persist,compress=zstd")))
 
 (define bootfs
   (file-system
@@ -51,7 +49,7 @@
    (create-mount-point? #t)
    (type "btrfs")
    (device (file-system-label "root"))
-   (options "subvol=/persist/boot,compress=zstd,discard=async")))
+   (options "subvol=/gnu/boot,compress=zstd")))
 
 (define homefs
   (file-system
@@ -59,23 +57,22 @@
    (create-mount-point? #t)
    (type "btrfs")
    (device (file-system-label "root"))
-   (options "subvol=/persist/home,compress=zstd,discard=async")))
+   (options "subvol=/persist/home,compress=zstd")))
 
 (define my-file-systems
   (list
-
    rootfs
    gnufs
-   persistfs
-
-   etcfs
+   ;; not needed in general case
+   ;; etcfs
    varfs
 
+   persistfs
    bootfs
    homefs
 
    (file-system
-    (mount-point "/boot/efi")
+    (mount-point "/boot/esp")
     (create-mount-point? #t)
     (dependencies (list bootfs))
     (device (file-system-label "ESP"))
@@ -94,16 +91,14 @@
     (create-mount-point? "1777")
     (device "tmpfs")
     (type "tmpfs")
-    (flags '(no-suid no-dev))
-    (check? #f))
+    (flags '(no-suid no-dev)))
 
    (file-system
     (mount-point "/var/guix/temproots")
     (create-mount-point? #t)
     (device "tmpfs")
     (type "tmpfs")
-    (flags '(no-suid no-dev))
-    (check? #f))))
+    (flags '(no-suid no-dev)))))
 
 (operating-system
  (locale "en_US.utf8")
@@ -133,7 +128,7 @@
  (bootloader
   (bootloader-configuration
    (bootloader grub-efi-bootloader)
-   (targets (list "/boot/efi"))
+   (targets (list "/boot/esp"))
    (keyboard-layout keyboard-layout)))
 
  (swap-devices '())