From 85a567a7050ec1c69863a96394fd80095c25ee89 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Sat, 13 Apr 2024 04:55:58 +0000 Subject: [PATCH] imperium: put imperium on backyard's hardware --- machine/imperium/default.nix | 7 ++++--- machine/imperium/hardware-configuration.nix | 13 ++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/machine/imperium/default.nix b/machine/imperium/default.nix index 217bc24..aa295aa 100644 --- a/machine/imperium/default.nix +++ b/machine/imperium/default.nix @@ -8,9 +8,10 @@ beatific.hostName = "imperium"; - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub = { + enable = true; + device = "/dev/sda"; + }; networking.networkmanager.enable = true; diff --git a/machine/imperium/hardware-configuration.nix b/machine/imperium/hardware-configuration.nix index 64232f6..008b9ca 100644 --- a/machine/imperium/hardware-configuration.nix +++ b/machine/imperium/hardware-configuration.nix @@ -8,23 +8,18 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/75addc56-2a0d-431e-a0c5-f6ee0e370e61"; + { device = "/dev/disk/by-uuid/798089ca-f249-431d-aa08-65909b85a184"; fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/610F-1EB7"; - fsType = "vfat"; - }; - swapDevices = - [ { device = "/dev/disk/by-uuid/cc464bb4-e1c8-46c0-adbb-ea1a3cfa5b03"; } + [ { device = "/dev/disk/by-uuid/5d55f9b7-cde3-403d-9c91-61c4b68c71f9"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -33,8 +28,8 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.nebula.beatific.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; }