From 2b1fb15b6f54d2857ae5ef045f36a409078ce271 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 29 Mar 2024 18:34:41 +1000 Subject: [PATCH] somehow -still- forgot the hardware config ._. --- hosts/proserpina/hardware-configuration.nix | 64 +++------------------ 1 file changed, 9 insertions(+), 55 deletions(-) diff --git a/hosts/proserpina/hardware-configuration.nix b/hosts/proserpina/hardware-configuration.nix index db81d71..47a61f8 100644 --- a/hosts/proserpina/hardware-configuration.nix +++ b/hosts/proserpina/hardware-configuration.nix @@ -4,69 +4,23 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot = { - kernelModules = [ - "kvm-intel" + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - extraModulePackages = [ - ]; - initrd = { - availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "sd_mod" - # "rtsc_pci_sdmmc" - ]; - kernelModules = [ - ]; - secrets = { - # "crypto_keyfile.bin" = null; - }; - luks = { - devices."luks-c2b8b1cb-6d01-4e7c-a659-1fcf01618c41" = { - device = "/dev/disk/by-uuid/c2b8b1cb-6d01-4e7c-a659-1fcf01618c41"; - }; - }; - }; - }; - fileSystems."/" = { - device = "/dev/disk/by-uuid/0c83c280-0f65-4d0b-9451-58052ea168f2"; - fsType = "ext4"; - }; - - # boot.initrd.luks.devices."luks-c2b8b1cb-6d01-4e7c-a659-1fcf01618c41".device = "/dev/disk/by-uuid/c2b8b1cb-6d01-4e7c-a659-1fcf01618c41"; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/4E83-1199"; - fsType = "vfat"; - }; - - swapDevices =[ - { device = "/dev/disk/by-uuid/81efa66d-8a22-49ad-9f2e-abb3e10061da"; } - ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking = { - useDHCP = lib.mkDefault true; - interfaces = { - enp0s31f6.useDHCP = lib.mkDefault true; - wlp58s0.useDHCP = lib.mkDefault true; - }; - }; + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - }