Enhancement: Consolidate hardware/boot config.

This commit is contained in:
Joey Hafner 2025-02-06 15:32:26 -08:00
parent c31ae00a50
commit 94322b6492
Signed by: Jafner
GPG Key ID: 6D9A24EF2F389E55
3 changed files with 15 additions and 20 deletions

View File

@ -1,15 +0,0 @@
{ ... }: {
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/88a3f223-ed42-4be1-a748-bb9e0f9007dc";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/744D-0867";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
};
boot.loader.systemd-boot.enable = true;
}

View File

@ -1,6 +1,5 @@
{ sys, ... }: { { sys, ... }: {
imports = [ imports = [
./boot.nix
./docker.nix ./docker.nix
./hardware.nix ./hardware.nix
./network-shares.nix ./network-shares.nix

View File

@ -2,17 +2,28 @@
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ ... }: { { ... }: {
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/88a3f223-ed42-4be1-a748-bb9e0f9007dc";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/744D-0867";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
};
swapDevices = [ { device = "/.swapfile"; size = 32*1024;} ];
boot = { boot = {
loader.systemd-boot.enable = true;
initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
initrd.kernelModules = [ ]; initrd.kernelModules = [ ];
kernelModules = [ "kvm-amd" ]; kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
}; };
swapDevices = [
{ device = "/.swapfile"; size = 32*1024;}
];
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;