diff --git a/machines/default.nix b/machines/default.nix index 374be37..4f219ec 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -25,7 +25,7 @@ in fuuko = { system = "x86_64-linux"; extraModules = [ - hardware.common-cpu-intel + hardware.common-cpu-amd hardware.common-pc-ssd ]; diff --git a/machines/fuuko/README.md b/machines/fuuko/README.md index 53b0fc1..03cf7ed 100644 --- a/machines/fuuko/README.md +++ b/machines/fuuko/README.md @@ -2,21 +2,16 @@ ## Hardware -HP MicroServer Gen8 with an [Intel Xeon E3-1220L -v2](https://ark.intel.com/content/www/us/en/ark/products/65735/intel-xeon-processor-e3-1220l-v2-3m-cache-2-30-ghz.html) -and 8 GiB ECC RAM (1600 MHz). It isn’t the best choice, but I already had it -lying around and it is acceptable after changing the CPU from the original -Celeron. I decided not to use another consumer-grade computer for this, since -the server offers ECC memory and therefore should be more reliable. +Custom build frankensteined into a HP Compaq dx7500’s case (with all garbage removed). -The SSD (Intel DC S4500 480GB) is connected to the first drive slot in a 3.5 ″ -adapter. I originally wanted to connect it to the internal ODD SATA port, but -since it only supports SATA2 (3Gbit/s) and does not support booting from it, -requiring an additional boot drive, I decided against this. - -For storage it has two Hard drives (Seagate Exos E 7E8 ST8000NM000A and WD -Ultrastar DC HC320 0B36404) in BTRFS RAID1. They are connected to the 2rd and -3th bay. Bay 3 is only SATA2, but that should not be the bottleneck. + * Motherboard: GIGABYTE B450M S2H + * CPU: AMD Ryzen 5 1400 + * RAM: 2×8GB GOODRAM DDR4-2666 CL19 + * PSU: be quiet! System Power B9 450W (the dx7500’s Lite-On didn’t have an 8-pin CPU connector) + * SSD: Intel DC S4500 480GB + * HDD: Seagate Exos E 7E8 ST8000NM000A and WD Ultrastar DC HC320 0B36404 (both 8 TB) in btrfs RAID1 + * GPU (required for text console/firmware due to lack of integrated graphics in R5 1400): ATI Radeon HD 4650 (to be replaced with a fanless SUNIX VGA0411/Volari Z11) + * Case fan: Noctua NF-A9 PWM ## Purpose diff --git a/machines/fuuko/hardware-configuration.nix b/machines/fuuko/hardware-configuration.nix index 3ee4d13..fa7f285 100644 --- a/machines/fuuko/hardware-configuration.nix +++ b/machines/fuuko/hardware-configuration.nix @@ -7,8 +7,7 @@ ]; boot = { - kernelModules = [ "kvm-intel" ]; - blacklistedKernelModules = [ "acpi_power_meter" ]; # constantly pollutes kernel log + kernelModules = [ "kvm-amd" ]; extraModulePackages = [ ]; supportedFilesystems = [ "btrfs" ]; kernelParams = [ "ip=dhcp" ]; @@ -16,10 +15,9 @@ availableKernelModules = [ "aesni_intel" # hardware crypto for luks "ahci" - "ehci_pci" + "cryptd" + "r8169" # network interface for remote unlocking "sd_mod" - "tg3" # network interface - "uhci_hcd" "usb_storage" "usbhid" "xhci_pci" @@ -72,10 +70,10 @@ } ]; - powerManagement.cpuFreqGovernor = "performance"; + powerManagement.cpuFreqGovernor = "schedutil"; - networking.useDHCP = false; - networking.interfaces.eno1.useDHCP = true; - - systemd.network.wait-online.extraArgs = [ "-i" "eno1" ]; + networking = { + useDHCP = false; + interfaces.enp8s0.useDHCP = true; + }; }