mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-10 23:00:39 +02:00
chore: remove with; usage
This commit is contained in:
parent
7bb25e5d7a
commit
d7a0022766
7 changed files with 46 additions and 46 deletions
|
@ -10,18 +10,18 @@ in {
|
|||
main = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.main}";
|
||||
content = with lib.disko.gpt; {
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
grub = partGrub;
|
||||
bios = partBoot "512M";
|
||||
rpool = partLuksZfs disks.main "rpool" "100%";
|
||||
grub = lib.disko.gpt.partGrub;
|
||||
bios = lib.disko.gpt.partBoot "512M";
|
||||
rpool = lib.disko.gpt.partLuksZfs disks.main "rpool" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
zpool = with lib.disko.zfs; {
|
||||
rpool = mkZpool {datasets = impermanenceZfsDatasets;};
|
||||
zpool = {
|
||||
rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -10,18 +10,18 @@ in {
|
|||
m2-ssd = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.m2-ssd}";
|
||||
content = with lib.disko.gpt; {
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "1G";
|
||||
swap = partSwap "16G";
|
||||
rpool = partLuksZfs disks.m2-ssd "rpool" "100%";
|
||||
efi = lib.disko.gpt.partEfi "1G";
|
||||
swap = lib.disko.gpt.partSwap "16G";
|
||||
rpool = lib.disko.gpt.partLuksZfs disks.m2-ssd "rpool" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
zpool = with lib.disko.zfs; {
|
||||
rpool = mkZpool {datasets = impermanenceZfsDatasets;};
|
||||
zpool = {
|
||||
rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,27 +10,27 @@ in {
|
|||
m2-ssd = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.m2-ssd}";
|
||||
content = with lib.disko.gpt; {
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
rpool = partLuksZfs disks.m2-ssd "rpool" "100%";
|
||||
rpool = lib.disko.gpt.partLuksZfs disks.m2-ssd "rpool" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
boot-ssd = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.boot-ssd}";
|
||||
content = with lib.disko.gpt; {
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "8G";
|
||||
swap = partSwap "100%";
|
||||
efi = lib.disko.gpt.partEfi "8G";
|
||||
swap = lib.disko.gpt.partSwap "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
zpool = with lib.disko.zfs; {
|
||||
rpool = mkZpool {datasets = impermanenceZfsDatasets;};
|
||||
zpool = {
|
||||
rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,18 +10,18 @@ in {
|
|||
main = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.main}";
|
||||
content = with lib.disko.gpt; {
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
grub = partGrub;
|
||||
bios = partBoot "512M";
|
||||
rpool = partLuksZfs disks.main "rpool" "100%";
|
||||
grub = lib.disko.gpt.partGrub;
|
||||
bios = lib.disko.gpt.partBoot "512M";
|
||||
rpool = lib.disko.gpt.partLuksZfs disks.main "rpool" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
zpool = with lib.disko.zfs; {
|
||||
rpool = mkZpool {datasets = impermanenceZfsDatasets;};
|
||||
zpool = {
|
||||
rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -11,11 +11,11 @@ in {
|
|||
m2-ssd-1 = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.m2-ssd-1}";
|
||||
content = with lib.disko.gpt; {
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "1G";
|
||||
rpool = partLuksZfs disks.m2-ssd-1 "rpool" "100%";
|
||||
efi = lib.disko.gpt.partEfi "1G";
|
||||
rpool = lib.disko.gpt.partLuksZfs disks.m2-ssd-1 "rpool" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -30,13 +30,13 @@ in {
|
|||
device = "/dev/disk/by-id/${disk}";
|
||||
content = lib.disko.content.luksZfs disk "storage";
|
||||
});
|
||||
zpool = with lib.disko.zfs; {
|
||||
rpool = mkZpool {
|
||||
zpool = {
|
||||
rpool = lib.disko.zfs.mkZpool {
|
||||
mode = "mirror";
|
||||
datasets =
|
||||
impermanenceZfsDatasets
|
||||
lib.disko.zfs.impermanenceZfsDatasets
|
||||
// {
|
||||
"safe/guests" = unmountable;
|
||||
"safe/guests" = lib.disko.zfs.unmountable;
|
||||
};
|
||||
};
|
||||
storage = mkZpool {
|
||||
|
|
|
@ -10,22 +10,22 @@ in {
|
|||
m2-ssd = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.m2-ssd}";
|
||||
content = with lib.disko.gpt; {
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "1G";
|
||||
swap = partSwap "16G";
|
||||
rpool = partLuksZfs disks.m2-ssd "rpool" "100%";
|
||||
efi = lib.disko.gpt.partEfi "1G";
|
||||
swap = lib.disko.gpt.partSwap "16G";
|
||||
rpool = lib.disko.gpt.partLuksZfs disks.m2-ssd "rpool" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
zpool = with lib.disko.zfs; {
|
||||
rpool = mkZpool {
|
||||
zpool = {
|
||||
rpool = lib.disko.zfs.mkZpool {
|
||||
datasets =
|
||||
impermanenceZfsDatasets
|
||||
lib.disko.zfs.impermanenceZfsDatasets
|
||||
// {
|
||||
"safe/guests" = unmountable;
|
||||
"safe/guests" = lib.disko.zfs.unmountable;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -10,18 +10,18 @@ in {
|
|||
mmc = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.mmc}";
|
||||
content = with lib.disko.gpt; {
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "1G";
|
||||
swap = partSwap "8G";
|
||||
rpool = partLuksZfs disks.mmc "rpool" "100%";
|
||||
efi = lib.disko.gpt.partEfi "1G";
|
||||
swap = lib.disko.gpt.partSwap "8G";
|
||||
rpool = lib.disko.gpt.partLuksZfs disks.mmc "rpool" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
zpool = with lib.disko.zfs; {
|
||||
rpool = mkZpool {datasets = impermanenceZfsDatasets;};
|
||||
zpool = {
|
||||
rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue