From b7137a836fd5e569f81b0c7b70731b6d7b95c925 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Sun, 8 Oct 2023 08:24:29 +0700
Subject: [PATCH] nixserver: enable hydra & misc hw code reorg

---
 system/devices/radxa-rock5a-server.nix   |  9 +++++++++
 system/hardware/radxa-rock5a/default.nix | 12 +++---------
 system/hosts/nixserver/home.nix          |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/system/devices/radxa-rock5a-server.nix b/system/devices/radxa-rock5a-server.nix
index 696457a..320b966 100644
--- a/system/devices/radxa-rock5a-server.nix
+++ b/system/devices/radxa-rock5a-server.nix
@@ -1,6 +1,7 @@
 { config
 , lib
 , router-config
+, hardware
 , ... }:
 
 let
@@ -16,6 +17,14 @@ in
   imports = [
     ../hardware/radxa-rock5a
     ../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;
diff --git a/system/hardware/radxa-rock5a/default.nix b/system/hardware/radxa-rock5a/default.nix
index 766472d..21edda0 100644
--- a/system/hardware/radxa-rock5a/default.nix
+++ b/system/hardware/radxa-rock5a/default.nix
@@ -3,13 +3,7 @@
 , ... }:
 
 {
-  boot.initrd.availableKernelModules = [
-    "ahci" "usbhid" "usb_storage"
-    # network in initrd
-    "dwmac-rk" 
-    # fde unlock in initrd
-    "dm_mod" "dm_crypt" "encrypted_keys"
-  ];
+  boot.initrd.availableKernelModules = [ "ahci" "usbhid" "usb_storage" ];
 
   # TODO: switch to upstream when PCIe support works
   # 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.name = "rockchip/rk3588s-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; } ];
-  nixpkgs.hostPlatform = "aarch64-linux";
 
   # for a change, I have a big EFI partition on this device
   boot.loader.systemd-boot.enable = true;
@@ -39,4 +32,5 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   boot.initrd.compressor = "zstd";
+  nixpkgs.hostPlatform = "aarch64-linux";
 }
diff --git a/system/hosts/nixserver/home.nix b/system/hosts/nixserver/home.nix
index ce9310c..62defcd 100644
--- a/system/hosts/nixserver/home.nix
+++ b/system/hosts/nixserver/home.nix
@@ -136,7 +136,7 @@ in {
   };
 
   services.hydra = {
-    enable = false;
+    enable = true;
     hydraURL = "home.${cfg.domainName}/hydra";
     listenHost = "127.0.0.1";
     minimumDiskFree = 30;