Changes to mounts on Firefly

This commit is contained in:
Jimbo 2024-11-05 02:23:30 -05:00
parent 6a5774b9b9
commit dca52b5676

View file

@ -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" ];
};
};
};
};