From 939abc56daafd9fda40e24f24cd609757fe6d08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 29 Jun 2025 20:01:02 +0200 Subject: [PATCH] update btrfs --- nix/disko/tungsten/btrfs.nix | 88 ++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 48 deletions(-) diff --git a/nix/disko/tungsten/btrfs.nix b/nix/disko/tungsten/btrfs.nix index 88f5a492..73120015 100644 --- a/nix/disko/tungsten/btrfs.nix +++ b/nix/disko/tungsten/btrfs.nix @@ -27,60 +27,52 @@ extraOpenArgs = []; settings.allowDiscards = true; content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; - }; - }; - }; + type = "gpt"; + partitions = { + # Set swap device as resume device + swap = { + size = "4G"; + content = { + type = "swap"; + discardPolicy = "both"; + resumeDevice = true; + }; + }; - # Use LVM to create a partition for swap - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - # Set swap device as resume device - swap = { - size = "4G"; - content = { - type = "swap"; - discardPolicy = "both"; - resumeDevice = true; - }; - }; + # Use btrfs over ext4 for: + # - compression + # nix store can be shrinked using this feature + # - more transparent partitions (subvolumes) + # no more "I need more space here and not there" + btrfs = { + size = "100%"; + content = { + type = "btrfs"; - # Use btrfs over ext4 for: - # - compression - # nix store can be shrinked using this feature - # - more transparent partitions (subvolumes) - # no more "I need more space here and not there" - btrfs = { - size = "100%"; - content = { - type = "btrfs"; + mountpoint = "/btrfs-root"; - mountpoint = "/btrfs-root"; + # # DANGER: + # # Override existing partition at partition creation + # extraArgs = ["-f"]; - # # DANGER: - # # Override existing partition at partition creation - # extraArgs = ["-f"]; + subvolumes = { + "/root" = { + mountpoint = "/"; + }; - subvolumes = { - "/root" = { - mountpoint = "/"; - }; + "/home" = { + mountOptions = ["compress=zstd"]; + mountpoint = "/home"; + }; - "/home" = { - mountOptions = ["compress=zstd"]; - mountpoint = "/home"; - }; - - "/nix" = { - mountOptions = ["compress=zstd" "noatime"]; - mountpoint = "/nix"; + "/nix" = { + mountOptions = ["compress=zstd" "noatime"]; + mountpoint = "/nix"; + }; + }; + }; + }; + }; }; }; };