diff --git a/configuration.nix b/configuration.nix index 7db4036..fc753c8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,17 +1,10 @@ { modulesPath, config, lib, pkgs, ... }: { imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - (modulesPath + "/profiles/qemu-guest.nix") + ./hardware-configuration.nix ./disk-config.nix ]; - boot.loader.grub = { - # no need to set devices, disko will add all devices that have a EF02 partition to the list already - devices = [ - "/dev/nvme0n1" - ]; - efiSupport = true; - efiInstallAsRemovable = true; - }; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; services.openssh.enable = true; environment.systemPackages = map lib.lowPrio [ @@ -24,5 +17,5 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDCOZgbO0xzciMbBCSC1fZLEY8qIB4c+UK0niwVvaphOPp87xjE+eyeHDhQLntxhTeOgAob24pBmhycAkQXxu0FcDZN7RmZOyNTFFQPd2w8KRgGwUnZtfOFUaT9KxV0xpnfnJN+PeCeys9/jz5XHBzlei0HPuaC85KcKqa1GMNldtFELqa1MySAIQ0mV3TynLooqqjdr2kqou9DPEqC2A2VrdDn2FFc1+RuaiEitmOG2rLUHLSje2R+GN3kkPPtWI/CzapwHC/j7hcgPEPZcAT5Pe+cQqTMXpMGK2ZFsQsgCIhwPfKg/o8LN5QKYm8sJb42OftgTpoUJNMMWvRYv9J1lRa57wLyVNl56wchj/d5kh13CJ+WDR7KnaY00xlRHxXChp9ZU7sqFMgBOlS1OUQv5iDdUerLPrSIr9JqMVtkcP1betqDKFZLJYvRpV35IQX6FsDOuzTYkojX8gKsxPL6Prq0EHwtuatvGxNq/en7VBbzHRpf32+x8luypkFLoKM=" ]; - system.stateVersion = "23.11"; + system.stateVersion = "24.11"; } diff --git a/disk-config.nix b/disk-config.nix index 2e99e5c..a53282c 100644 --- a/disk-config.nix +++ b/disk-config.nix @@ -7,11 +7,6 @@ content = { type = "gpt"; partitions = { - boot = { - name = "boot"; - size = "1M"; - type = "EF02"; - }; ESP = { size = "500M"; type = "EF00"; diff --git a/hardware-configuration.nix b/hardware-configuration.nix new file mode 100644 index 0000000..f9cd790 --- /dev/null +++ b/hardware-configuration.nix @@ -0,0 +1,25 @@ +# 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 + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + 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; + # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}