From 44a48f41b94023ecb00ef38f82dcfd4c9b4da633 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Fri, 22 Aug 2025 22:01:27 +0200 Subject: [PATCH] have to run intel for the moment --- systems/amd-server/configuration.nix | 2 +- .../amd-server/hardware-configuration-bak.nix | 38 +++++++++++++++++++ systems/amd-server/hardware-configuration.nix | 6 +-- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 systems/amd-server/hardware-configuration-bak.nix diff --git a/systems/amd-server/configuration.nix b/systems/amd-server/configuration.nix index 9224d1b..795d54e 100644 --- a/systems/amd-server/configuration.nix +++ b/systems/amd-server/configuration.nix @@ -59,7 +59,7 @@ defaultGateway.address = "192.168.0.1"; nameservers = [ "192.168.0.10" "1.1.1.1" ]; - bridges.br0 = { interfaces = [ "enp6s0" ]; }; + bridges.br0 = { interfaces = [ "enp0s31f6" ]; }; interfaces.br0 = { ipv4.addresses = [{ address = "192.168.0.20"; diff --git a/systems/amd-server/hardware-configuration-bak.nix b/systems/amd-server/hardware-configuration-bak.nix new file mode 100644 index 0000000..08bee7c --- /dev/null +++ b/systems/amd-server/hardware-configuration-bak.nix @@ -0,0 +1,38 @@ +# 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 = + [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/a3c34c9e-06be-49dc-a5d3-4156defa11e7"; + fsType = "btrfs"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/AE1C-16B9"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + # 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.enp6s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/systems/amd-server/hardware-configuration.nix b/systems/amd-server/hardware-configuration.nix index 08bee7c..01e98fd 100644 --- a/systems/amd-server/hardware-configuration.nix +++ b/systems/amd-server/hardware-configuration.nix @@ -6,10 +6,9 @@ { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "uas" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = { @@ -33,6 +32,7 @@ # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }