diff --git a/hosts/i15.nix b/hosts/i15.nix
index 08d90df..61b3803 100644
--- a/hosts/i15.nix
+++ b/hosts/i15.nix
@@ -12,18 +12,27 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-label/NIX_BOOT";
+    fsType = "vfat";
+  };
+
   fileSystems."/" = {
-    device = "/dev/disk/by-label/ROOT";
+    device = "/dev/disk/by-label/NIX_ROOT";
     fsType = "btrfs";
     options = [ "subvol=nixos" "compress=zstd" "noatime" ];
   };
 
-  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-label/NIXBOOT";
-    fsType = "vfat";
+  fileSystems."/home" = {
+    device = "/dev/disk/by-label/NIX_ROOT";
+    fsType = "btrfs";
+    options = [ "subvol=home" "compress=zstd" "noatime" ];
   };
 
-  swapDevices = [ ];
+  swapDevices = [{
+    device = "/swap/swapfile";
+    size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
+  }];
 
   # 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