nixserver: enable hydra & misc hw code reorg

home/hosts/nixmsi.nix

@@ -70,7 +70,7 @@
     steam-run steam
     # faf-client
     (osu-lazer-bin.override {
-      command_prefix = "${obs-studio-plugins.obs-vkcapture}/bin/obs-gamecapture";
+      command_prefix = "env SDL_VIDEODRIVER=wayland ${obs-studio-plugins.obs-vkcapture}/bin/obs-gamecapture";
     })
     taisei
     techmino

pkgs/gimp.nix

@@ -100,11 +100,9 @@ in gimp.overrideAttrs (old: rec {
     "-Dappdata-test=disabled"
   ];
   enableParallelBuilding = false;
-  env = old.env // {
+  env = old.env // { GIO_EXTRA_MODULES = "${glib-networking}/lib/gio/modules"; };
-    GIO_EXTRA_MODULES = "${glib-networking}/lib/gio/modules";
-  };
   preConfigure = "";
-    postPatch = ''
+  postPatch = ''
     patchShebangs \
       app/tests/create_test_env.sh \
       tools/gimp-mkenums
@@ -126,7 +124,10 @@ in gimp.overrideAttrs (old: rec {
   '';
 
   preFixup = ''
-    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ graphviz ]}:$out/bin")
+    gappsWrapperArgs+=(\
+      --prefix PATH : "${lib.makeBinPath [ graphviz ]}:$out/bin" \
+      --suffix XDG_DATA_DIRS : "${gnome.adwaita-icon-theme}/share" \
+    )
   '';
   postFixup = ''
     moveToOutput "share/doc" "$devdoc"

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;

system/hardware/radxa-rock5a/default.nix

@@ -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
   # 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";
 }

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;