gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated disko to submodule

Browse source
This commit is contained in:
Gerg-L 2023-08-21 21:16:47 -04:00
parent 0b0f47a859
commit 2e26046d07
3 changed files with 35 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hosts/game-laptop/disko.nix
View file

@ -5,33 +5,29 @@
device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456"; device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456";
type = "disk"; type = "disk";
content = { content = {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ ESP = {
{
name = "ESP"; name = "ESP";
start = "1MiB"; start = "1MiB";
end = "1GiB"; end = "1GiB";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
}; };
} };
{ root = {
name = "root";
start = "1GiB"; start = "1GiB";
end = "100%"; end = "100%";
part-type = "primary"; part-type = "primary";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/"; mountpoint = "/";
}; };
} };
]; };
}; };
}; };
}; };

50
hosts/gerg-desktop/disko.nix
View file

@ -4,82 +4,72 @@
disk = { disk = {
"0E" = { "0E" = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E"; device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E";
content = { content = {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ BOOT = {
{ type = "EF00";
name = "BOOT";
start = "0"; start = "0";
end = "4G"; end = "4G";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/efi0E"; mountpoint = "/efi0E";
}; };
} };
{ swap = {
name = "swap";
start = "5G"; start = "5G";
end = "21G"; end = "21G";
content = { content = {
type = "swap"; type = "swap";
randomEncryption = true; randomEncryption = true;
}; };
} };
{ zfsroot = {
name = "zfsroot";
start = "21G"; start = "21G";
end = "100%"; end = "100%";
content = { content = {
type = "zfs"; type = "zfs";
pool = "rpool"; pool = "rpool";
}; };
} };
]; };
}; };
}; };
"22" = { "22" = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N22"; device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N22";
content = { content = {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ BOOT = {
{ type = "EF00";
name = "BOOT";
start = "0"; start = "0";
end = "4G"; end = "4G";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/efi22"; mountpoint = "/efi22";
}; };
} };
{ swap = {
name = "swap";
start = "5G"; start = "5G";
end = "21G"; end = "21G";
content = { content = {
type = "swap"; type = "swap";
randomEncryption = true; randomEncryption = true;
}; };
} };
{ zfsroot = {
name = "zfsroot ";
start = "21G"; start = "21G";
end = "100%"; end = "100%";
content = { content = {
type = "zfs"; type = "zfs";
pool = "rpool"; pool = "rpool";
}; };
} };
]; };
}; };
}; };
}; };

20
hosts/moms-laptop/disko.nix
View file

@ -5,33 +5,29 @@
device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144"; device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";
type = "disk"; type = "disk";
content = { content = {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ ESP = {
{
name = "ESP";
start = "1MiB"; start = "1MiB";
end = "1GiB"; end = "1GiB";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
}; };
} };
{ root = {
name = "root";
start = "1GiB"; start = "1GiB";
end = "100%"; end = "100%";
part-type = "primary"; part-type = "primary";
bootable = true; type = "EF00";
content = { content = {
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/"; mountpoint = "/";
}; };
} };
]; };
}; };
}; };
}; };