From 889d0a8736e59e1f00f8a85c00376fca18aa5690 Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Thu, 28 Sep 2023 23:34:34 +0200 Subject: [PATCH 1/2] changed impermanence config for subvolumes --- nixos/modules/impermanence.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/impermanence.nix b/nixos/modules/impermanence.nix index 0f955fd..9fe8998 100644 --- a/nixos/modules/impermanence.nix +++ b/nixos/modules/impermanence.nix @@ -17,7 +17,7 @@ options.impermanence = { enable = mkEnableOption "impermanence"; storagePath = mkOption { type = types.path; - default = "/persist/persist"; + default = "/persist"; description = "The path where persistent data is stored"; }; name = mkOption { From 2ffe242e8f0ba8cbe48fd7c5c99ea29eabc999a2 Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Fri, 29 Sep 2023 00:03:06 +0200 Subject: [PATCH 2/2] changed nyarlathotep disk config for impermanence --- .../nyarlathotep/hardware-configuration.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/machines/nyarlathotep/hardware-configuration.nix b/nixos/machines/nyarlathotep/hardware-configuration.nix index 83a6dcc..9f0307e 100644 --- a/nixos/machines/nyarlathotep/hardware-configuration.nix +++ b/nixos/machines/nyarlathotep/hardware-configuration.nix @@ -7,18 +7,18 @@ }; fileSystems."/persist" = { device = "/dev/disk/by-uuid/a72da670-f631-49b1-bcb3-6d378cc1f2d0"; - fsType = "ext4"; - neededForBoot = true; + fsType = "btrfs"; + options = [ "subvol=persist" ]; }; fileSystems."/boot" = { - device = "/persist/boot"; - fsType = "none"; - options = [ "bind" ]; + device = "/dev/disk/by-uuid/a72da670-f631-49b1-bcb3-6d378cc1f2d0"; + fsType = "btrfs"; + options = [ "subvol=boot" ]; }; fileSystems."/nix" = { - device = "/persist/nix"; - fsType = "none"; - options = [ "bind" ]; + device = "/dev/disk/by-uuid/a72da670-f631-49b1-bcb3-6d378cc1f2d0"; + fsType = "btrfs"; + options = [ "subvol=nix" ]; }; fileSystems."/var/vmail" = { device = "/dev/disk/by-uuid/23c44c93-5035-4e29-9e46-75c1c08f4cea";