Compare commits

..

No commits in common. "b7137a836fd5e569f81b0c7b70731b6d7b95c925" and "bb180360b97bedca1596b0b519df3a80dcd41b09" have entirely different histories.

5 changed files with 16 additions and 20 deletions

View file

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

View file

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

View file

@ -1,7 +1,6 @@
{ config { config
, lib , lib
, router-config , router-config
, hardware
, ... }: , ... }:
let let
@ -17,14 +16,6 @@ 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,7 +3,13 @@
, ... }: , ... }:
{ {
boot.initrd.availableKernelModules = [ "ahci" "usbhid" "usb_storage" ]; boot.initrd.availableKernelModules = [
"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;
@ -20,11 +26,12 @@
}; };
}); });
boot.kernelParams = [ "dtb=/${config.hardware.deviceTree.name}" ]; boot.kernelParams = [ "boot.shell_on_fail" "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;
@ -32,5 +39,4 @@
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 = true; enable = false;
hydraURL = "home.${cfg.domainName}/hydra"; hydraURL = "home.${cfg.domainName}/hydra";
listenHost = "127.0.0.1"; listenHost = "127.0.0.1";
minimumDiskFree = 30; minimumDiskFree = 30;