talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Enable /boot partition.

Browse Source
This commit is contained in:
Tom Alexander 2025-11-15 20:05:02 -05:00
parent f13689e2c1
commit 09e36de78e
Signed by: talexander
GPG Key ID: 36C99E8B3C39D85F
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nix/configuration/hosts/i_only_boot_zfs/default.nix
View File

@ -26,15 +26,15 @@
me.mountPersistence = true; me.mountPersistence = true;
# Toggle to start writing the extlinux config which will be used by zfsbootmenu # Toggle to start writing the extlinux config which will be used by zfsbootmenu
boot.loader.generic-extlinux-compatible.enable = true; # boot.loader.generic-extlinux-compatible.enable = true;
boot.loader.systemd-boot.enable = lib.mkForce false; # boot.loader.systemd-boot.enable = lib.mkForce false;
me.optimizations = { me.optimizations = {
# enable = true; # enable = true;
arch = "kabylake"; # arch = "kabylake";
# build_arch = "x86-64-v3"; # build_arch = "x86-64-v3";
system_features = [ system_features = [
"gccarch-kabylake" # "gccarch-kabylake"
"gccarch-x86-64-v3" "gccarch-x86-64-v3"
"benchmark" "benchmark"
"big-parallel" "big-parallel"

26
nix/configuration/hosts/i_only_boot_zfs/disk-config.nix
View File

@ -76,15 +76,15 @@
mountpoint = "/"; mountpoint = "/";
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank"; postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank";
}; };
# "linux/nix/boot" = { "linux/nix/boot" = {
# type = "zfs_fs"; type = "zfs_fs";
# options = { options = {
# mountpoint = "legacy"; mountpoint = "legacy";
# "org.zfsbootmenu:nixos" = "on"; "org.zfsbootmenu:nixos" = "on";
# }; };
# mountpoint = "/"; mountpoint = "/boot";
# postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/boot@blank$' || zfs snapshot zroot/linux/nix/boot@blank"; postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/boot@blank$' || zfs snapshot zroot/linux/nix/boot@blank";
# }; };
"linux/nix/nix" = { "linux/nix/nix" = {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
@ -129,10 +129,10 @@
"noatime" "noatime"
"norelatime" "norelatime"
]; ];
# fileSystems."/boot".options = [ fileSystems."/boot".options = [
# "noatime" "noatime"
# "norelatime" "norelatime"
# ]; ];
fileSystems."/nix".options = [ fileSystems."/nix".options = [
"noatime" "noatime"
"norelatime" "norelatime"

7
nix/configuration/roles/optimized_build/default.nix
View File

@ -50,10 +50,13 @@
}; };
config = lib.mkMerge [ config = lib.mkMerge [
{
boot.zfs.package = pkgs.zfs_unstable;
}
(lib.mkIf (!config.me.optimizations.enable) ( (lib.mkIf (!config.me.optimizations.enable) (
lib.mkMerge [ lib.mkMerge [
{ {
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_16; boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17;
} }
] ]
)) ))
@ -92,7 +95,7 @@
HZ = lib.kernel.freeform "300"; HZ = lib.kernel.freeform "300";
HZ_300 = lib.kernel.yes; HZ_300 = lib.kernel.yes;
HZ_1000 = lib.kernel.no; HZ_1000 = lib.kernel.no;
} prev.linux_6_16; } prev.linux_6_17;
} }
) )
(final: prev: { (final: prev: {