diff --git a/hosts/Infini-OPTIPLEX/filesystems.nix b/hosts/Infini-OPTIPLEX/filesystems.nix
index 0bc7652..d3fb7c1 100644
--- a/hosts/Infini-OPTIPLEX/filesystems.nix
+++ b/hosts/Infini-OPTIPLEX/filesystems.nix
@@ -2,6 +2,7 @@
 let
   uuid = uuid: "/dev/disk/by-uuid/${uuid}";
   main = uuid "9d4bf2d8-f139-42e7-937a-541a7870d806";
+  data = uuid "456cebd3-f800-4733-a783-90ed7c8978f7";
   commonOptions = [ "autodefrag" "noatime" "ssd" "compress=zstd:1" ];
 
   mkMain' = options: {
@@ -11,6 +12,14 @@ let
   };
   mkMainOpt = options: (mkMain' options) // { neededForBoot = true; };
   mkMain = subvol: mkMainOpt [ "subvol=${subvol}" ];
+
+  mkData' = options: {
+    device = data;
+    fsType = "btrfs";
+    options = commonOptions ++ options;
+  };
+  mkDataOpt = options: (mkData' options) // { neededForBoot = true; };
+  mkData = subvol: mkDataOpt [ "subvol=${subvol}" ];
 in
 {
   fileSystems = {
@@ -21,7 +30,9 @@ in
     };
 
     "/media/main" = mkMain' [ ];
+    "/media/data" = mkData' [ ];
     "/persist" = mkMain "root";
+    "/persist/srv" = mkData "root/srv";
     "/etc/ssh" = mkMain "root/etc/ssh";
     "/nix" = mkMain "nix";
     "/boot" = mkMain "boot";