2 files changed, 1 insertions, 68 deletions
diff --git a/machines/nixos/x86_64-linux/rivendell/default.nix b/machines/nixos/x86_64-linux/rivendell/default.nix
index 787f090..700a57f 100644
--- a/machines/nixos/x86_64-linux/rivendell/default.nix
+++ b/machines/nixos/x86_64-linux/rivendell/default.nix
@@ -9,7 +9,7 @@
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     inputs.nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series
-    ./disks.nix
+    ../../../../profiles/disk/btrfs-on-luks.nix
   ];
 
   boot.initrd.availableKernelModules = [
diff --git a/machines/nixos/x86_64-linux/rivendell/disks.nix b/machines/nixos/x86_64-linux/rivendell/disks.nix
deleted file mode 100644
index 8cb1f32..0000000
--- a/machines/nixos/x86_64-linux/rivendell/disks.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-let
-  btrfsopt = [
-    "compress=zstd"
-    "noatime"
-  ];
-in
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [
-                  "fmask=0022"
-                  "dmask=0022"
-                ];
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "nixos";
-                passwordFile = "/tmp/pass";
-                settings = {
-                  allowDiscards = true;
-                };
-                content = {
-                  type = "btrfs";
-                  extraArgs = [ "-f" ];
-                  subvolumes = {
-                    "@root" = {
-                      mountpoint = "/";
-                      mountOptions = btrfsopt;
-                    };
-                    "@home" = {
-                      mountpoint = "/home";
-                      mountOptions = btrfsopt;
-                    };
-                    "@nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = btrfsopt;
-                    };
-                    "@data" = {
-                      mountpoint = "/data";
-                      mountOptions = btrfsopt;
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}