tidying up

This commit is contained in:
serenity-F 2024-09-26 17:36:44 +10:00
parent dc42ba6406
commit 9ecdd8ba51
No known key found for this signature in database
2 changed files with 34 additions and 10 deletions

View file

@ -7,8 +7,8 @@
#"${builtins.fetchTarball "<flake module url>"}/module.nix" #"${builtins.fetchTarball "<flake module url>"}/module.nix"
## Include host specific options ## Include host specific options
./hardware.nix ./hardware
./network.nix ./network
## Include core config options ## Include core config options
../../config.nix ../../config.nix

View file

@ -9,8 +9,15 @@
## Include results from the (non-existent) hardware scan ## Include results from the (non-existent) hardware scan
## as well as the host-specific hardware config options ## as well as the host-specific hardware config options
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
## Disko commented out for now as we have "broken" it
## Disko config, should eventually let us nuke our boot drive and reinstall
## with zero worries.
## commented out for now as we have "broken" it
#./disko.nix #./disko.nix
## ZFS module, separated to help keep us sane while we set it up lol
./zfs.nix
]; ];
fileSystems."/" = fileSystems."/" =
@ -23,13 +30,30 @@
## Enable swap on luks ## Enable swap on luks
boot = { boot = {
kernelModules = [ "kvm-intel" ]; kernelModules = [
extraModulePackages = [ ]; "kvm-intel"
supportedFilesystems = [ "btrfs" "xfs" "ntfs" ]; ];
extraModulePackages = [
];
supportedFilesystems = [
"btrfs"
"xfs"
"ntfs"
];
initrd = { initrd = {
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; availableKernelModules = [
kernelModules = [ ]; "xhci_pci"
"ehci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
kernelModules = [
];
systemd.enable = true; systemd.enable = true;
secrets = { secrets = {
"/boot/crypto_keyfile.bin" = null; "/boot/crypto_keyfile.bin" = null;
}; };
@ -40,6 +64,7 @@
}; };
}; };
}; };
loader = { loader = {
efi = { efi = {
canTouchEfiVariables = true; canTouchEfiVariables = true;
@ -81,7 +106,6 @@
#cpu.intel.updateMicrocode = true; #cpu.intel.updateMicrocode = true;
enableAllFirmware = true; enableAllFirmware = true;
bluetooth.enable = false; bluetooth.enable = false;
graphics = { graphics = {