From a0d378a0e63e92c2b9a081b579b23328d4a73c51 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 17 Jul 2024 22:14:31 -0500 Subject: [PATCH] No extras because I don't understand disko yet --- disko/default.nix | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/disko/default.nix b/disko/default.nix index a35ccd2..f26dabe 100644 --- a/disko/default.nix +++ b/disko/default.nix @@ -1,7 +1,6 @@ { standardWithHibernateSwap = { disks ? ["/dev/sda"], - extraSubvolumes ? {}, swapSize, ... }: { @@ -54,22 +53,20 @@ content = { type = "btrfs"; extraArgs = ["-f"]; - subvolumes = - { - "/nixos" = { - mountpoint = "/"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/home" = { - mountpoint = "/home"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = ["compress=zstd" "noatime"]; - }; - } - // extraSubvolumes; + subvolumes = { + "/nixos" = { + mountpoint = "/"; + mountOptions = ["compress=zstd" "noatime"]; + }; + "/home" = { + mountpoint = "/home"; + mountOptions = ["compress=zstd" "noatime"]; + }; + "/nix" = { + mountpoint = "/nix"; + mountOptions = ["compress=zstd" "noatime"]; + }; + }; }; }; };