nixserver: enable hydra & misc hw code reorg

This commit is contained in:
chayleaf 2023-10-08 08:24:29 +07:00
parent 84a2a540f2
commit b7137a836f
3 changed files with 13 additions and 10 deletions

View file

@ -1,6 +1,7 @@
{ config { config
, lib , lib
, router-config , router-config
, hardware
, ... }: , ... }:
let let
@ -16,6 +17,14 @@ in
imports = [ imports = [
../hardware/radxa-rock5a ../hardware/radxa-rock5a
../hosts/nixserver ../hosts/nixserver
hardware.common-pc-ssd
];
boot.initrd.availableKernelModules = [
# network in initrd
"dwmac-rk"
# fde unlock in initrd
"dm_mod" "dm_crypt" "encrypted_keys"
]; ];
networking.useDHCP = true; networking.useDHCP = true;

View file

@ -3,13 +3,7 @@
, ... }: , ... }:
{ {
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [ "ahci" "usbhid" "usb_storage" ];
"ahci" "usbhid" "usb_storage"
# network in initrd
"dwmac-rk"
# fde unlock in initrd
"dm_mod" "dm_crypt" "encrypted_keys"
];
# TODO: switch to upstream when PCIe support works # TODO: switch to upstream when PCIe support works
# boot.kernelPackages = pkgs.linuxPackages_testing; # boot.kernelPackages = pkgs.linuxPackages_testing;
@ -26,12 +20,11 @@
}; };
}); });
boot.kernelParams = [ "boot.shell_on_fail" "dtb=/${config.hardware.deviceTree.name}" ]; boot.kernelParams = [ "dtb=/${config.hardware.deviceTree.name}" ];
hardware.deviceTree.enable = true; hardware.deviceTree.enable = true;
hardware.deviceTree.name = "rockchip/rk3588s-rock-5a.dtb"; hardware.deviceTree.name = "rockchip/rk3588s-rock-5a.dtb";
hardware.deviceTree.filter = "*-rock-5a*.dtb"; hardware.deviceTree.filter = "*-rock-5a*.dtb";
hardware.deviceTree.overlays = [ { name = "rock-5a-pcie"; filter = "*-rock-5a*.dtb"; dtsFile = ./rock-5a-pcie.dtso; } ]; hardware.deviceTree.overlays = [ { name = "rock-5a-pcie"; filter = "*-rock-5a*.dtb"; dtsFile = ./rock-5a-pcie.dtso; } ];
nixpkgs.hostPlatform = "aarch64-linux";
# for a change, I have a big EFI partition on this device # for a change, I have a big EFI partition on this device
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -39,4 +32,5 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.compressor = "zstd"; boot.initrd.compressor = "zstd";
nixpkgs.hostPlatform = "aarch64-linux";
} }

View file

@ -136,7 +136,7 @@ in {
}; };
services.hydra = { services.hydra = {
enable = false; enable = true;
hydraURL = "home.${cfg.domainName}/hydra"; hydraURL = "home.${cfg.domainName}/hydra";
listenHost = "127.0.0.1"; listenHost = "127.0.0.1";
minimumDiskFree = 30; minimumDiskFree = 30;