Foxtrot won't boot
All checks were successful
/ check (push) Successful in 5m23s

This commit is contained in:
Daniel Flanagan 2024-12-28 13:41:53 -06:00
parent 45492cb10a
commit b9685178d4
2 changed files with 42 additions and 21 deletions

View file

@ -1,10 +1,15 @@
{lib, ...}: let {lib, ...}: let
inherit (lib.attrsets) mapAttrs' filterAttrs; inherit (lib.attrsets) mapAttrs' filterAttrs;
ESP = size: { ESP = inputs @ {
size ? "4G",
label ? "ESP",
name ? "ESP",
}:
{
priority = 1; priority = 1;
start = "1M"; start = "1M";
label = "EFI"; label = label;
name = "ESP"; name = name;
end = size; end = size;
type = "EF00"; type = "EF00";
content = { content = {
@ -15,9 +20,15 @@
"umask=0077" "umask=0077"
]; ];
}; };
}; }
in { // inputs;
in rec {
standardWithHibernateSwap = { standardWithHibernateSwap = {
esp ? {
label = "ESP";
size = "4G";
name = "ESP";
},
disk, disk,
swapSize, swapSize,
... ...
@ -37,7 +48,7 @@ in {
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
ESP = ESP "4G"; ESP = ESP esp;
swap = { swap = {
size = swapSize; size = swapSize;
content = { content = {
@ -82,6 +93,16 @@ in {
}; };
}; };
}; };
foxtrot = standardWithHibernateSwap {
disk = "nvme0n1";
swapSize = "32G";
esp = {
label = "EFI";
name = "EFI";
};
};
standard = {disk, ...}: { standard = {disk, ...}: {
# this is my standard partitioning scheme for my machines: an LUKS-encrypted # this is my standard partitioning scheme for my machines: an LUKS-encrypted
# btrfs volume # btrfs volume
@ -93,7 +114,7 @@ in {
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
ESP = ESP "4G"; ESP = ESP {size = "4G";};
luks = { luks = {
size = "100%"; size = "100%";
content = { content = {
@ -140,7 +161,7 @@ in {
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
ESP = ESP "5G"; ESP = ESP {size = "5G";};
root = { root = {
size = "100%"; size = "100%";
content = { content = {

View file

@ -461,7 +461,7 @@
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-unstable-defaults home-manager-unstable-defaults
outputs.diskoConfigurations.standardWithHibernateSwap outputs.diskoConfigurations.foxtrot
hardware.nixosModules.framework-13-7040-amd hardware.nixosModules.framework-13-7040-amd
common common