changes to see if they work

etc/calamares/modules/mount.conf

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-#
 extraMounts:
     - device: proc
       fs: proc
@@ -11,32 +7,35 @@ extraMounts:
       mountPoint: /sys
     - device: /dev
       mountPoint: /dev
-      options: bind
+      options: [ bind ]
     - device: tmpfs
       fs: tmpfs
       mountPoint: /run
     - device: /run/udev
       mountPoint: /run/udev
-      options: bind
+      options: [ bind ]
-
-extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
-
+      efi: true
-# Btrfs subvolumes to create if root filesystem is on btrfs volume.
-# If mountpoint is mounted already to another partition, it is ignored.
-# Separate subvolume for swapfile is handled separately and automatically.
 
 btrfsSubvolumes:
     - mountPoint: /
       subvolume: /@
     - mountPoint: /home
       subvolume: /@home
+    - mountPoint: /root
+      subvolume: /@root
+    - mountPoint: /srv
+      subvolume: /@srv
     - mountPoint: /var/cache
       subvolume: /@cache
     - mountPoint: /var/log
       subvolume: /@log
+    - mountPoint: /var/tmp
+      subvolume: /@tmp
+
+btrfsSwapSubvol: /@swap
 
 mountOptions:
     - filesystem: default
@@ -44,6 +43,10 @@ mountOptions:
     - filesystem: efi
       options: [ defaults, umask=0077 ]
     - filesystem: btrfs
-      options: [ defaults, noatime, compress=lzo ]
+      options: [ defaults, noatime, compress=zstd ]
     - filesystem: btrfs_swap
       options: [ defaults, noatime ]
+    - filesystem: ext4
+      options: [ defaults, noatime, commit=60 ]
+    - filesystem: xfs
+      options: [ defaults, lazytime, noatime, attr2, inode64, logbsize=256k, noquota ]