Bun/nixos-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add changes for secure boot and how mounts happen

Browse source
This commit is contained in:
Jimbo 2024-10-07 23:05:46 -04:00
parent 796bdd1a42
commit 121653cf1e
5 changed files with 261 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
system/hosts/JimDesktop/configuration.nix
View file

@ -24,7 +24,7 @@
# Hardware
./hardware-configuration.nix
./../../modules/systemdboot.nix
./../../modules/lanzaboote.nix
./../../modules/opengl.nix
./../../modules/filesystems.nix
./../../modules/nvidia.nix

53
system/hosts/JimDesktop/hardware-configuration.nix
View file

@ -22,9 +22,7 @@ in {
(modulesPath + "/installer/scan/not-detected.nix")
];
# Set all boot options
boot = {
# Set a kernel version and load/blacklist drivers
kernelPackages = pkgs.unstable.linuxPackages_zen;
blacklistedKernelModules = [
"pcspkr"
@ -48,6 +46,9 @@ in {
"vfio_iommu_type1"
"kvm-amd"
];
# Encryption and TPM
systemd.enable = true;
luks.devices = {
"crypt-ssd" = {
device = "/dev/disk/by-uuid/52110c74-19b6-40ef-9710-e6c9b157005f";
@ -61,7 +62,7 @@ in {
# Additional entry to boot from the second GPU
specialisation = {
gputwo.configuration = {
boot.kernelParams = commonKernelParams ++ ["vfio-pci.ids=10de:2504,10de:228e"];
boot.kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:2504,10de:228e" ];
};
};
@ -92,8 +93,33 @@ in {
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
# Games and such
"/mnt/Linux1" = {
device = "/dev/disk/by-uuid/b2901f8c-ffda-4b88-bb63-a9ea0c96ccb4";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
};
"/mnt/Linux2" = {
device = "/dev/disk/by-uuid/f08e4f38-162c-402f-ba2a-5925151b78bf";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
};
"/mnt/Windows1" = {
device = "/dev/disk/by-uuid/10BC97B2BC979138";
options = [ "nosuid" "nodev" "noauto" ];
};
"/mnt/Windows2" = {
device = "/dev/disk/by-uuid/0A5A3420237C863A";
options = [ "nosuid" "nodev" "noauto" ];
};
# Miscellaneous mounts
"/etc/libvirt" = {
device = "/dev/disk/by-label/Qemu";
device = "/dev/disk/by-uuid/f18a0302-9914-471d-828c-85ab1a67a8be";
options = [ "nosuid" "nodev" "nofail" ];
};
"/etc/libvirt/VMs/Bulk" = {
depends = [ "/etc/libvirt" ];
device = "/dev/disk/by-uuid/3eb36c3e-81ac-4281-89f0-c89242d88dd6";
options = [ "nosuid" "nodev" "nofail" ];
};
"/var/lib/libvirt" = {
@ -101,22 +127,8 @@ in {
device = "/etc/libvirt/varlibvirt";
options = [ "bind" "rw" ];
};
"/mnt/Linux1" = {
device = "/dev/disk/by-label/Linux1";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
};
"/mnt/Linux2" = {
device = "/dev/disk/by-label/Linux2";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
};
"/mnt/Windows1" = {
device = "/dev/disk/by-label/Windows1";
options = [ "nosuid" "nodev" "noauto" ];
};
"/mnt/Windows2" = {
device = "/dev/disk/by-label/Windows2";
options = [ "nosuid" "nodev" "noauto" ];
};
# Network mounts
"/home/jimbo/JimboNFS" = {
device = "${outputs.ips.server}:/export/JimboNFS";
fsType = "nfs4";
@ -131,7 +143,6 @@ in {
# Enables DHCP on each ethernet and wireless interface.
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}