diff --git a/setup.sh b/setup.sh
index 7dc8a5c..f9b5202 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,5 +1,5 @@
-sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy,format,mount system/vincents-old-hp/disk.nix
+sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode disko system/vincents-old-hp/disk.nix
 
-sudo nixos-install --flake .#vincent-old-hp
+sudo nixos-install --flake .#vincents-old-hp
 
 echo "REBOOT YOUR COMPUTER"
diff --git a/system/vincents-old-hp/hardware-configuration.nix b/system/vincents-old-hp/hardware-configuration.nix
index 6a1d84e..2bae8bf 100644
--- a/system/vincents-old-hp/hardware-configuration.nix
+++ b/system/vincents-old-hp/hardware-configuration.nix
@@ -14,27 +14,41 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/sda2";
+    { device = "/dev/disk/by-uuid/f010b3df-9a60-4a40-a54d-d98c6a6ce992";
       fsType = "btrfs";
-      options = [ "subvol=root" "ssd" "defaults" "noatime" "compress=zstd:5" ];
+      options = [ "subvol=root" ];
+    };
+
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/7a43a7b8-6abd-4266-af16-3a5b0637ad77";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/7673-9394";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/sda2";
+    { device = "/dev/disk/by-uuid/f010b3df-9a60-4a40-a54d-d98c6a6ce992";
       fsType = "btrfs";
-      options = [ "subvol=home" "ssd" "defaults" "noatime" "compress=zstd:5" ];
+      options = [ "subvol=home" ];
     };
 
   fileSystems."/nix" =
-    { device = "/dev/sda2";
+    { device = "/dev/disk/by-uuid/f010b3df-9a60-4a40-a54d-d98c6a6ce992";
       fsType = "btrfs";
-      options = [ "subvol=nix" "ssd" "defaults" "noatime" "compress=zstd:5" ];
+      options = [ "subvol=nix" ];
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/sda1";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+  fileSystems."/persist" =
+    { device = "/dev/disk/by-uuid/f010b3df-9a60-4a40-a54d-d98c6a6ce992";
+      fsType = "btrfs";
+      options = [ "subvol=persist" ];
+    };
+
+  fileSystems."/var/log" =
+    { device = "/dev/disk/by-uuid/f010b3df-9a60-4a40-a54d-d98c6a6ce992";
+      fsType = "btrfs";
+      options = [ "subvol=log" ];
     };
 
   swapDevices = [ ];