diff --git a/system/susans-hp/hardware-configuration.nix b/system/susans-hp/hardware-configuration.nix
index d2ad42b..24785e4 100644
--- a/system/susans-hp/hardware-configuration.nix
+++ b/system/susans-hp/hardware-configuration.nix
@@ -15,15 +15,42 @@
 
   fileSystems."/" =
     { device = "/dev/nvme0n1p2";
-      fsType = "ext4";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
     };
 
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/7a43a7b8-6abd-4266-af16-3a5b0637ad77";
+
   fileSystems."/boot" =
     { device = "/dev/nvme0n1p1";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
+  fileSystems."/home" =
+    { device = "/dev/nvme0n1p2";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/nvme0n1p2";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/persist" =
+    { device = "/dev/nvme0n1p2";
+      fsType = "btrfs";
+      options = [ "subvol=persist" ];
+    };
+
+  fileSystems."/var/log" =
+    { device = "/dev/nvme0n1p2";
+      fsType = "btrfs";
+      options = [ "subvol=log" ];
+    };
+
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/system/vincents-hp/hardware-configuration.nix b/system/vincents-hp/hardware-configuration.nix
index d2ad42b..24785e4 100644
--- a/system/vincents-hp/hardware-configuration.nix
+++ b/system/vincents-hp/hardware-configuration.nix
@@ -15,15 +15,42 @@
 
   fileSystems."/" =
     { device = "/dev/nvme0n1p2";
-      fsType = "ext4";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
     };
 
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/7a43a7b8-6abd-4266-af16-3a5b0637ad77";
+
   fileSystems."/boot" =
     { device = "/dev/nvme0n1p1";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
+  fileSystems."/home" =
+    { device = "/dev/nvme0n1p2";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/nvme0n1p2";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/persist" =
+    { device = "/dev/nvme0n1p2";
+      fsType = "btrfs";
+      options = [ "subvol=persist" ];
+    };
+
+  fileSystems."/var/log" =
+    { device = "/dev/nvme0n1p2";
+      fsType = "btrfs";
+      options = [ "subvol=log" ];
+    };
+
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/system/vincents-old-hp/configuration.nix b/system/vincents-old-hp/configuration.nix
index f585fc6..4c2b0b7 100755
--- a/system/vincents-old-hp/configuration.nix
+++ b/system/vincents-old-hp/configuration.nix
@@ -156,7 +156,7 @@
       boxbuddy
       # office apps
       bottles
-      onlyoffice-bin_latest
+      libreoffice-qt
       logseq
       zoom-us
       orca-slicer