Changes to mounts on Firefly
This commit is contained in:
parent
6a5774b9b9
commit
dca52b5676
|
@ -1,12 +1,10 @@
|
||||||
{ disko, ... }:
|
{ disko, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [ disko.nixosModules.disko ];
|
||||||
disko.nixosModules.disko
|
|
||||||
];
|
|
||||||
|
|
||||||
disko.devices = {
|
disko.devices = {
|
||||||
disk = {
|
disk = {
|
||||||
main = {
|
firefly = {
|
||||||
type = "disk";
|
type = "disk";
|
||||||
device = "/dev/nvme0n1";
|
device = "/dev/nvme0n1";
|
||||||
content = {
|
content = {
|
||||||
|
@ -28,10 +26,10 @@
|
||||||
type = "luks";
|
type = "luks";
|
||||||
name = "crypt-nvme";
|
name = "crypt-nvme";
|
||||||
settings.allowDiscards = true;
|
settings.allowDiscards = true;
|
||||||
#passwordFile = "/tmp/secret.key";
|
passwordFile = "/tmp/secret.key";
|
||||||
content = {
|
content = {
|
||||||
type = "lvm_pv";
|
type = "lvm_pv";
|
||||||
vg = "nixos";
|
vg = "firefly";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -41,7 +39,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
lvm_vg = {
|
lvm_vg = {
|
||||||
nixos = {
|
firefly = {
|
||||||
type = "lvm_vg";
|
type = "lvm_vg";
|
||||||
lvs = {
|
lvs = {
|
||||||
root = {
|
root = {
|
||||||
|
@ -50,28 +48,35 @@
|
||||||
type = "btrfs";
|
type = "btrfs";
|
||||||
extraArgs = [ "-f" ];
|
extraArgs = [ "-f" ];
|
||||||
subvolumes = {
|
subvolumes = {
|
||||||
"/@" = {
|
"/root" = {
|
||||||
mountpoint = "/";
|
mountpoint = "/";
|
||||||
mountOptions = [ "compress=zstd" "noatime" ];
|
mountOptions = [ "compress=zstd" "noatime" ];
|
||||||
};
|
};
|
||||||
"/@prev" = {
|
"/prev" = {
|
||||||
mountpoint = "/prev";
|
mountpoint = "/prev";
|
||||||
mountOptions = [ "compress=zstd" "noatime" ];
|
mountOptions = [ "compress=zstd" "noatime" ];
|
||||||
};
|
};
|
||||||
"/@nix" = {
|
"/nix" = {
|
||||||
mountpoint = "/nix";
|
mountpoint = "/nix";
|
||||||
mountOptions = [ "compress=zstd" "noatime" ];
|
mountOptions = [ "compress=zstd" "noatime" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Impermanence
|
# Impermanence
|
||||||
"/@root" = {
|
"/persist" = {
|
||||||
mountpoint = "/persist";
|
mountpoint = "/persist";
|
||||||
mountOptions = [ "compress=zstd" "noatime" ];
|
mountOptions = [ "compress=zstd" "noatime" ];
|
||||||
};
|
};
|
||||||
"/@jimbo" = {
|
"/persist/.snapshots" = {
|
||||||
|
mountOptions = [ "compress=zstd" "noatime" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
"/jimbo" = {
|
||||||
mountpoint = "/persist/home/jimbo";
|
mountpoint = "/persist/home/jimbo";
|
||||||
mountOptions = [ "compress=zstd" "noatime" ];
|
mountOptions = [ "compress=zstd" "noatime" ];
|
||||||
};
|
};
|
||||||
|
"/jimbo/.snapshots" = {
|
||||||
|
mountOptions = [ "compress=zstd" "noatime" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue