a lot of stuff

1 files changed, 45 insertions, 17 deletions

diff --git a/hosts/desktop/disko.nix b/hosts/desktop/disko.nix
index 8e93ef7..d492ca6 100644
--- a/hosts/desktop/disko.nix
+++ b/hosts/desktop/disko.nix
@@ -23,29 +23,37 @@
                 type = "btrfs";
                 extraArgs = [ "-f" ];
                 subvolumes = {
-                  "root" = {
+                  "@" = {
                     mountpoint = "/";
-                    mountOptions = [ "compress=zstd" "noatime" ];
+                    mountOptions = [ "compress=zstd:1" "noatime" ];
                   };
-                  "nix" = {
+                  "@home" = {
+                    mountpoint = "/home";
+                    mountOptions = [ "compress=zstd:1" "noatime" ];
+                  };
+                  "@nix" = {
                     mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd" "noatime" ];
+                    mountOptions = [ "compress=zstd:1" "noatime" ];
                   };
-                  "home" = {
-                    mountpoint = "/home";
-                    mountOptions = [ "compress=zstd" "noatime" "autodefrag" ];
+                  "@log" = {
+                    mountpoint = "/var/log";
+                    mountOptions = [ "compress=zstd:1" "noatime" ];
+                  };
+                  "@games" = {
+                    mountpoint = "/games";
+                    mountOptions = [ "noatime" ];
                   };
-                  "llms" = {
+                  "@llms" = {
                     mountpoint = "/llms";
-                    mountOptions = [ "compress=zstd" "noatime" "autodefrag"];
+                    mountOptions = [ "noatime"];
                   };
-                  "vms" = {
+                  "@vms" = {
                     mountpoint = "/vms";
-                    mountOptions = [ "noatime" "autodefrag" ];
+                    mountOptions = [ "nodatacow" "noatime" ];
                   };
-                  "swap" = {
+                  "@swap" = {
                     mountpoint = "/.swapvol";
-                    swap.swapfile.size = "32G";
+                    mountOptions = [ "nodatacow" "noatime" ];
                   };
                 };
               };
@@ -62,10 +70,30 @@
             media = {
               size = "100%";
               content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/media";
-                # extraArgs = [ "-f" ];
+                type = "btrfs";
+                extraArgs = [ "-f" ];
+                subvolumes = {
+                  "@archive" = {
+                    mountpoint = "/media/archive";
+                    mountOptions = [ "compress=zstd:3" "autodefrag" "noatime" ];
+                  };
+                  "@movies" = {
+                    mountpoint = "/media/movies";
+                    mountOptions = [ "compress=zstd:3" "autodefrag" "noatime" ];
+                  };
+                  "@anime" = {
+                    mountpoint = "/media/movies";
+                    mountOptions = [ "compress=zstd:3" "autodefrag" "noatime" ];
+                  };
+                  "@pictures" = {
+                    mountpoint = "/media/pics";
+                    mountOptions = [ "compress=zstd:3" "autodefrag" "noatime" ];
+                  };
+                  "@videos" = {
+                    mountpoint = "/media/vids";
+                    mountOptions = [ "autodefrag" "noatime" ];
+                  };
+                };
               };
             };
           };