diff --git a/hosts/pi4/hardware-configuration.nix b/hosts/pi4/hardware-configuration.nix
index 93813bd..2337673 100644
--- a/hosts/pi4/hardware-configuration.nix
+++ b/hosts/pi4/hardware-configuration.nix
@@ -1,68 +1,100 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "uas" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "uas"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "none";
-      fsType = "tmpfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7EC2-DEAC";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  fileSystems."/firmware" =
-    { device = "/dev/disk/by-uuid/7E6D-6434";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
-
-  fileSystems."/etc" =
-    { device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
-      fsType = "btrfs";
-      options = [ "subvol=etc" ];
-    };
-
-  fileSystems."/var/log" =
-    { device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
-      fsType = "btrfs";
-      options = [ "subvol=log" ];
-    };
-
-  fileSystems."/root" =
-    { device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/d390a564-9ef9-4c7d-ae1a-93951e9873dd"; }
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [
+      "defaults"
+      "mode=755"
     ];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/7EC2-DEAC";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
+
+  fileSystems."/firmware" = {
+    device = "/dev/disk/by-uuid/7E6D-6434";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
+    fsType = "btrfs";
+    options = [
+      "subvol=nix"
+      "compress-force=zstd"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/etc" = {
+    device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
+    fsType = "btrfs";
+    options = [
+      "subvol=etc"
+      "compress-force=zstd"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/var/log" = {
+    device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
+    fsType = "btrfs";
+    options = [
+      "subvol=log"
+      "compress-force=zstd"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/root" = {
+    device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
+    fsType = "btrfs";
+    options = [
+      "subvol=root"
+      "compress-force=zstd"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/1318620e-747a-4f5c-a285-889245256472";
+    fsType = "btrfs";
+    options = [
+      "subvol=home"
+      "compress-force=zstd"
+    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/d390a564-9ef9-4c7d-ae1a-93951e9873dd"; }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's