From d4a34ffe193cb6b982a9772b23794ce298adf785 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Fri, 19 Jan 2024 00:51:37 +0000 Subject: [PATCH] Regenerate hardware-configuration.nix from nixos-generate-config --- machine/centroid/default.nix | 6 +++ machine/centroid/hardware-configuration.nix | 50 ++++++++++++++++----- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/machine/centroid/default.nix b/machine/centroid/default.nix index 034ed29..2744859 100644 --- a/machine/centroid/default.nix +++ b/machine/centroid/default.nix @@ -5,6 +5,12 @@ ./hardware-configuration.nix ]; + boot.loader.grub = { + efiSupport = true; + efiInstallAsRemovable = true; + device = "nodev"; + }; + beatific.hostName = "centroid"; beatific.defaults = { nebula = false; diff --git a/machine/centroid/hardware-configuration.nix b/machine/centroid/hardware-configuration.nix index 30c7f9f..a6e22ac 100644 --- a/machine/centroid/hardware-configuration.nix +++ b/machine/centroid/hardware-configuration.nix @@ -1,14 +1,40 @@ -{ modulesPath, ... }: +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + { - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.loader.grub = { - efiSupport = true; - efiInstallAsRemovable = true; - device = "nodev"; - }; - fileSystems."/boot" = { device = "/dev/disk/by-uuid/5D60-DD0E"; fsType = "vfat"; }; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; - boot.initrd.kernelModules = [ "nvme" ]; - fileSystems."/" = { device = "/dev/sda4"; fsType = "ext4"; }; - swapDevices = [ { device = "/dev/sda3"; } ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/a08e9b3c-8ac7-433e-bf2c-6da234a2fb4a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5D60-DD0E"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/6dce2950-f8dd-49eb-b4d3-fdcf06cf920b"; } + ]; + + # 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; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f0u1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }