Update disko

This commit is contained in:
Invariantspace 2024-01-12 21:01:53 +08:00
parent f0dd60eca4
commit 36e509ee4c
3 changed files with 52 additions and 63 deletions

View file

@ -1,36 +1,29 @@
{ ... }: { { ... }: {
disko.devices = { disko.devices = {
# Partition the physical disk # Partition the physical disk
disk = { disk.storage = {
storage = {
type = "disk"; type = "disk";
device = "/dev/nvme0n1"; device = "/dev/nvme0n1";
content = { content = {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ ESP = {
{
name = "esp";
start = "2MiB"; start = "2MiB";
end = "2GiB"; end = "2GiB";
fs-type = "fat32"; type = "EF00";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
}; };
} };
{ zfs = {
name = "zfs"; size = "100%";
start = "2GiB";
end = "100%";
content = { content = {
type = "zfs"; type = "zfs";
pool = "zroot"; pool = "zroot";
}; };
} };
];
}; };
}; };
}; };

View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "uas" "sd_mod" "sdhci_acpi" ]; boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "uas" "sd_mod" "sdhci_acpi" ];
@ -14,12 +15,14 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/9f65c4b3-1c87-42a0-8c1d-f3c1ff2e71b1"; {
device = "/dev/disk/by-uuid/9f65c4b3-1c87-42a0-8c1d-f3c1ff2e71b1";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/1C5A-E5B5"; {
device = "/dev/disk/by-uuid/1C5A-E5B5";
fsType = "vfat"; fsType = "vfat";
}; };

View file

@ -1,36 +1,29 @@
{ ... }: { { ... }: {
disko.devices = { disko.devices = {
# Partition the physical disk # Partition the physical disk
disk = { disk.storage = {
storage = {
type = "disk"; type = "disk";
device = "/dev/nvme0n1"; device = "/dev/nvme0n1";
content = { content = {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ ESP = {
{
name = "esp";
start = "1MiB"; start = "1MiB";
end = "1GiB"; end = "1GiB";
fs-type = "fat32"; type = "EF00";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
}; };
} };
{ zfs = {
name = "zfs"; size = "100%";
start = "1GiB";
end = "100%";
content = { content = {
type = "zfs"; type = "zfs";
pool = "zroot"; pool = "zroot";
}; };
} };
];
}; };
}; };
}; };