diff --git a/nixops/juno-hardware-configuration.nix b/nixops/juno-hardware-configuration.nix index 85b833c2..df480ca3 100644 --- a/nixops/juno-hardware-configuration.nix +++ b/nixops/juno-hardware-configuration.nix @@ -8,9 +8,9 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "ehci_pci" "ata_piix" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = @@ -18,12 +18,6 @@ fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4E51-B390"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -31,13 +25,13 @@ # 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.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; nixpkgs.config.nvidia.acceptLicense = true; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;