mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hmm

Browse Source
This commit is contained in:
mjallen18
2026-04-05 13:48:41 -05:00
parent f111b1c725
commit 10b906a27c
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
systems/x86_64-linux/jallen-nas/boot.nix
View File

@@ -3,28 +3,21 @@
... ...
}: }:
let let
kernel = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-zen4; kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-zen4;
# kernel = pkgs.linuxPackages_latest;
in in
{ {
# Configure bootloader with lanzaboot and secureboot
boot = { boot = {
# Override kernel to latest inherit kernelPackages;
kernelPackages = kernel;
kernelParams = [ "amd_iommu=pgtbl_v2" ]; kernelParams = [ "amd_iommu=pgtbl_v2" ];
initrd = { initrd = {
supportedFilesystems = [ "bcachefs" ]; supportedFilesystems = {
# clevis = { bcachefs = true;
# enable = false; };
# devices = {
# "/dev/disk/by-label/nas_pool".secretFile = "/etc/clevis/nas_pool.jwe";
# };
# };
}; };
# Enable binfmt emulation for ARM # Enable binfmt emulation for ARM
binfmt.emulatedSystems = [ "aarch64-linux" ]; # --argstr system aarch64-linux binfmt.emulatedSystems = [ "aarch64-linux" ];
}; };
} }

1
systems/x86_64-linux/matt-nixos/boot.nix
View File

@@ -57,7 +57,6 @@ in
nixpkgs.crossSystem.system = "aarch64-linux"; nixpkgs.crossSystem.system = "aarch64-linux";
environment = { environment = {
etc."clevis/disk.jwe".source = ./disk.jwe;
systemPackages = with pkgsVersion; [ systemPackages = with pkgsVersion; [
edk2-uefi-shell edk2-uefi-shell
]; ];

4
systems/x86_64-linux/matt-nixos/filesystems.nix
View File

@@ -18,7 +18,7 @@ in
clevis = { clevis = {
enable = lib.mkForce true; enable = lib.mkForce true;
devices = { devices = {
"/dev/disk/by-uuid/2b7e2033-2bcc-4fff-b248-833289f07f3d".secretFile = ../../../secrets/hdd.jwe; # config.sops.secrets."disk-key".path; "/dev/disk/by-uuid/6ec88702-d536-494c-bdfd-3cc5c8cdc505".secretFile = ../../../secrets/hdd.jwe; # config.sops.secrets."disk-key".path;
}; };
}; };
}; };
@@ -33,7 +33,7 @@ in
++ defaultLocalOptions; ++ defaultLocalOptions;
}; };
"/media/matt/slow" = { "/media/matt/slow" = {
device = "/dev/disk/by-uuid/2b7e2033-2bcc-4fff-b248-833289f07f3d"; device = "/dev/disk/by-uuid/6ec88702-d536-494c-bdfd-3cc5c8cdc505";
fsType = "bcachefs"; fsType = "bcachefs";
options = [ options = [
"noatime" "noatime"