diff --git a/hosts/firefly/disko/default.nix b/hosts/firefly/disko/default.nix index 0118394..11b8ce2 100644 --- a/hosts/firefly/disko/default.nix +++ b/hosts/firefly/disko/default.nix @@ -1,12 +1,10 @@ { disko, ... }: { - imports = [ - disko.nixosModules.disko - ]; + imports = [ disko.nixosModules.disko ]; disko.devices = { disk = { - main = { + firefly = { type = "disk"; device = "/dev/nvme0n1"; content = { @@ -28,10 +26,10 @@ type = "luks"; name = "crypt-nvme"; settings.allowDiscards = true; - #passwordFile = "/tmp/secret.key"; + passwordFile = "/tmp/secret.key"; content = { type = "lvm_pv"; - vg = "nixos"; + vg = "firefly"; }; }; }; @@ -41,7 +39,7 @@ }; lvm_vg = { - nixos = { + firefly = { type = "lvm_vg"; lvs = { root = { @@ -50,28 +48,35 @@ type = "btrfs"; extraArgs = [ "-f" ]; subvolumes = { - "/@" = { + "/root" = { mountpoint = "/"; mountOptions = [ "compress=zstd" "noatime" ]; }; - "/@prev" = { + "/prev" = { mountpoint = "/prev"; mountOptions = [ "compress=zstd" "noatime" ]; }; - "/@nix" = { + "/nix" = { mountpoint = "/nix"; mountOptions = [ "compress=zstd" "noatime" ]; }; # Impermanence - "/@root" = { + "/persist" = { mountpoint = "/persist"; mountOptions = [ "compress=zstd" "noatime" ]; }; - "/@jimbo" = { + "/persist/.snapshots" = { + mountOptions = [ "compress=zstd" "noatime" ]; + }; + + "/jimbo" = { mountpoint = "/persist/home/jimbo"; mountOptions = [ "compress=zstd" "noatime" ]; }; + "/jimbo/.snapshots" = { + mountOptions = [ "compress=zstd" "noatime" ]; + }; }; }; };