revert machine_id pull request

This commit is contained in:
Qubasa
2024-09-06 21:38:50 +02:00
parent 76541043a7
commit 323010bb04
27 changed files with 46 additions and 217 deletions

View File

@@ -17,19 +17,18 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
```nix hl_lines="14 40"
{ lib, ... }:
let
suffix = config.clan.core.machine.diskId;
mirrorBoot = idx: {
type = "disk";
device = "/dev/disk/by-id/${idx}";
content = {
type = "gpt";
partitions = {
"boot-${suffix}" = {
"${config.networking.hostName}-boot" = {
size = "1M";
type = "EF02"; # for grub MBR
priority = 1;
};
"ESP-${suffix}" = lib.mkIf (idx == "nvme-eui.002538b931b59865") {
"${config.networking.hostName}-ESP" = lib.mkIf (idx == "nvme-eui.002538b931b59865") {
size = "1G";
type = "EF00";
content = {
@@ -39,7 +38,7 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
mountOptions = [ "nofail" ];
};
};
"root-${suffix}" = {
"${config.networking.hostName}-root" = {
size = "100%";
content = {
type = "zfs";
@@ -109,19 +108,18 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
```nix hl_lines="14 40 41"
{ lib, ... }:
let
suffix = config.clan.core.machine.diskId;
mirrorBoot = idx: {
type = "disk";
device = "/dev/disk/by-id/${idx}";
content = {
type = "gpt";
partitions = {
"boot-${suffix}" = {
boot = {
size = "1M";
type = "EF02"; # for grub MBR
priority = 1;
};
"ESP-${suffix}" = lib.mkIf (idx == "nvme-eui.002538b931b59865") {
ESP = lib.mkIf (idx == "nvme-eui.002538b931b59865") {
size = "1G";
type = "EF00";
content = {
@@ -131,7 +129,7 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
mountOptions = [ "nofail" ];
};
};
"root-${suffix}" = {
zfs = {
size = "100%";
content = {
type = "zfs";