Compare commits

...

14 commits

Author SHA1 Message Date
db728f1fc0
builders: Specify extra platforms for Nix 2024-11-29 23:02:05 +01:00
deb35998b7
builders: Set correct Nix system features 2024-11-29 22:34:55 +01:00
d4b4561588
builders: Determine qemu executable paths at build time 2024-11-29 20:42:04 +01:00
71f81dbb0f
hydra: Allow user mode emulation on 20 % of builders 2024-11-29 16:42:11 +01:00
d0e97fa1ed
builders: Enable user mode emulation for RISC-V and ARM 2024-11-29 16:41:23 +01:00
8a93fb6c56
seras: Enable user mode emulation inside sandboxes 2024-11-29 15:24:45 +01:00
52f13d5dbd
seras: Enable RISC-V user mode emulation 2024-11-29 15:21:37 +01:00
Update Bot
9fea7edfec
flake.lock: Update
Flake lock file updates:

• Updated input 'firefox':
    'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=0ab60773023ac5c303b402e8a8c84708ea5c59bc' (2024-11-27)
  → 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=cf453c076add9ee34542a318fa7a7a865087921b' (2024-11-28)
• Added input 'firefox/eosyn':
    'git+https://woof.rip/mikael/eosyn.git?ref=refs/heads/main&rev=29adbc654463e677bc8bfbfa311c765584446bd8' (2024-11-28)
• Added input 'firefox/eosyn/lix':
    'f5754dc90a.tar.gz?narHash=sha256-2RNOVB3UIIxxjiFKrEqSgnSoHK%2Bolbw2o5g/63dDjJ8%3D&rev=f5754dc90ae9b1207656d0e29ad2704d3ef1e554' (2024-11-28)
• Added input 'firefox/eosyn/lix-module':
    '15b999f9c9.tar.gz?narHash=sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4%3D&rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730' (2024-11-26)
• Added input 'firefox/eosyn/lix-module/flake-utils':
    'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Added input 'firefox/eosyn/lix-module/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'firefox/eosyn/lix-module/flakey-profile':
    'github:lf-/flakey-profile/243c903fd8eadc0f63d205665a92d4df91d42d9d' (2024-04-12)
• Added input 'firefox/eosyn/lix-module/lix':
    follows 'firefox/eosyn/lix'
• Added input 'firefox/eosyn/lix-module/nixpkgs':
    follows 'firefox/eosyn/nixpkgs'
• Added input 'firefox/eosyn/nixpkgs':
    'github:NixOS/nixpkgs/af51545ec9a44eadf3fe3547610a5cdd882bc34e' (2024-11-26)
• Removed input 'firefox/neoidiosyn'
• Removed input 'firefox/neoidiosyn/lix'
• Removed input 'firefox/neoidiosyn/lix-module'
• Removed input 'firefox/neoidiosyn/lix-module/flake-utils'
• Removed input 'firefox/neoidiosyn/lix-module/flake-utils/systems'
• Removed input 'firefox/neoidiosyn/lix-module/flakey-profile'
• Removed input 'firefox/neoidiosyn/lix-module/lix'
• Removed input 'firefox/neoidiosyn/lix-module/nixpkgs'
• Removed input 'firefox/neoidiosyn/nixpkgs'
• Removed input 'firefox/nixpkgs'
• Updated input 'home-manager':
    'github:nix-community/home-manager/a9953635d7f34e7358d5189751110f87e3ac17da' (2024-11-24)
  → 'github:nix-community/home-manager/2f7739d01080feb4549524e8f6927669b61c6ee3' (2024-11-28)
• Updated input 'nixvim':
    'github:nix-community/nixvim/fc9178d124eba824f1862513314d351784e1a84c' (2024-11-27)
  → 'github:nix-community/nixvim/05331006a42846d6e55129b642485f45f90c9efc' (2024-11-29)
2024-11-29 04:20:15 +01:00
Update Bot
242e72e7cb
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/869ba3a87486289a4197b52a6c9e7222edf00b3e' (2024-11-26)
  → 'github:nix-community/disko/341482e2f4d888e3f60cae1c12c3df896e7230d8' (2024-11-27)
• Updated input 'firefox':
    'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=681bfba37de687030ee8be54d9d099792153d590' (2024-11-26)
  → 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=0ab60773023ac5c303b402e8a8c84708ea5c59bc' (2024-11-27)
• Updated input 'firefox/neoidiosyn':
    'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=abbf0fb2043f2b1adedeb1f3e9c3bfe0edeb5145' (2024-11-26)
  → 'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=6028166f27a98fe92913b1923b6e07b35c0c40d0' (2024-11-27)
• Updated input 'nixvim':
    'github:nix-community/nixvim/8b19d154823619af7ced464185e8d13ec80a758b' (2024-11-26)
  → 'github:nix-community/nixvim/fc9178d124eba824f1862513314d351784e1a84c' (2024-11-27)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a' (2024-11-23)
  → 'github:lnl7/nix-darwin/6ab87b7c84d4ee873e937108c4ff80c015a40c7a' (2024-11-26)
• Updated input 'nixvim/treefmt-nix':
    'github:numtide/treefmt-nix/705df92694af7093dfbb27109ce16d828a79155f' (2024-11-22)
  → 'github:numtide/treefmt-nix/84637a7ab04179bdc42aa8fd0af1909fba76ad0c' (2024-11-26)
2024-11-28 04:20:23 +01:00
Update Bot
ddb7bf0d93
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/2ed5e30fc7e34adf455db8b02b9151d3922a54ea' (2024-11-25)
  → 'github:nix-community/disko/869ba3a87486289a4197b52a6c9e7222edf00b3e' (2024-11-26)
• Updated input 'firefox':
    'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=e4a679e2a725ef216614c5a11543359503f507cc' (2024-11-25)
  → 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=681bfba37de687030ee8be54d9d099792153d590' (2024-11-26)
• Updated input 'firefox/neoidiosyn':
    'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=6f31daf4bb997f04fcad4425ecfa2451271c7c4f' (2024-11-25)
  → 'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=abbf0fb2043f2b1adedeb1f3e9c3bfe0edeb5145' (2024-11-26)
• Updated input 'firefox/neoidiosyn/lix-module':
    'aa2846680f.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18)
  → '15b999f9c9.tar.gz?narHash=sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4%3D&rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730' (2024-11-26)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367' (2024-11-19)
  → 'github:nixos/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d' (2024-11-25)
• Updated input 'nixvim':
    'github:nix-community/nixvim/a81a03a3f5dcdcdee5cbe831a9f2e81895e92875' (2024-11-24)
  → 'github:nix-community/nixvim/8b19d154823619af7ced464185e8d13ec80a758b' (2024-11-26)
• Updated input 'stylix':
    'github:danth/stylix/b667a340730dd3d0596083aa7c949eef01367c62' (2024-11-22)
  → 'github:danth/stylix/7689e621f87bce7b6ab1925dfd70ad1f4c80f334' (2024-11-26)
• Updated input 'stylix/base16-vim':
    'github:tinted-theming/base16-vim/6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d' (2024-05-19)
  → 'github:tinted-theming/base16-vim/61165b1632409bd55e530f3dbdd4477f011cadc6' (2024-11-18)
• Updated input 'stylix/flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'stylix/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'stylix/tinted-tmux':
    'github:tinted-theming/tinted-tmux/c02050bebb60dbb20cb433cd4d8ce668ecc11ba7' (2023-10-08)
  → 'github:tinted-theming/tinted-tmux/f0e7f7974a6441033eb0a172a0342e96722b4f14' (2024-10-21)
2024-11-27 04:20:41 +01:00
247420a189
crime: add lidarr 2024-11-26 15:16:08 +01:00
Update Bot
c2c39502c8
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/47bc8dfb6f48d5f66a3cb3a4cece83d8ace1f61a' (2024-11-24)
  → 'github:nix-community/disko/2ed5e30fc7e34adf455db8b02b9151d3922a54ea' (2024-11-25)
• Updated input 'firefox':
    'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=22fff6832b2828006061d5c8f781ca052f55bdb2' (2024-11-24)
  → 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=e4a679e2a725ef216614c5a11543359503f507cc' (2024-11-25)
• Updated input 'firefox/neoidiosyn':
    'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=b7171c109da4f52bf59ad5159ec13ee9246ec28d' (2024-11-24)
  → 'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=6f31daf4bb997f04fcad4425ecfa2451271c7c4f' (2024-11-25)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/53c853fb1a7e4f25f68805ee25c83d5de18dc699' (2024-11-21)
  → 'github:Mic92/sops-nix/3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa' (2024-11-25)
2024-11-26 04:20:22 +01:00
Update Bot
8b86e66c9d
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/5fd852c4155a689098095406500d0ae3d04654a8' (2024-11-14)
  → 'github:nix-community/disko/47bc8dfb6f48d5f66a3cb3a4cece83d8ace1f61a' (2024-11-24)
• Updated input 'firefox':
    'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=022ec0becb1ca7b96ddb9bdd046617075357c2cb' (2024-11-17)
  → 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=22fff6832b2828006061d5c8f781ca052f55bdb2' (2024-11-24)
• Updated input 'firefox/neoidiosyn':
    'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=86605e5489fb5045f4dee48de2a69082e17c033b' (2024-11-17)
  → 'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=b7171c109da4f52bf59ad5159ec13ee9246ec28d' (2024-11-24)
• Updated input 'firefox/neoidiosyn/lix':
    'c859d03013.tar.gz?narHash=sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE%3D&rev=c859d03013712b349d82ee6223948d6d03e63a8d' (2024-11-15)
  → '66f6dbda32.tar.gz?narHash=sha256-H7GN4%2B%2Ba4vE49SUNojZx%2BFSk4mmpb2ifJUtJMJHProI%3D&rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff' (2024-11-20)
• Updated input 'firefox/neoidiosyn/lix-module':
    '691193879d.tar.gz?narHash=sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA%3D&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09)
  → 'aa2846680f.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18)
• Updated input 'firefox/neoidiosyn/lix-module/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'florp-moderation':
    'git+https://woof.rip/florp/moderation.git?ref=refs/heads/main&rev=32e1061cb2ef3cd0eab0bd99f062a2776a73d459' (2024-11-14)
  → 'git+https://woof.rip/florp/moderation.git?ref=refs/heads/main&rev=81f0a4377c1218d328e7996636a02faf0597efa0' (2024-11-21)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10' (2024-11-14)
  → 'github:nix-community/home-manager/a9953635d7f34e7358d5189751110f87e3ac17da' (2024-11-24)
• Updated input 'lix':
    'ad9d06f783.tar.gz?narHash=sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U%3D' (2024-10-19)
  → 'ad9d06f783.tar.gz?narHash=sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U%3D&rev=ad9d06f7838a25beec425ff406fe68721fef73be' (2024-10-19)
• Updated input 'lix-module':
    '9098ac9576.tar.gz?narHash=sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu%2Bs%3D' (2024-10-19)
  → '9098ac9576.tar.gz?narHash=sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu%2Bs%3D&rev=9098ac95768f7006d7e070b88bae76939f6034e6' (2024-10-19)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12)
  → 'github:nixos/nixos-hardware/45348ad6fb8ac0e8415f6e5e96efe47dd7f39405' (2024-11-24)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
  → 'github:nixos/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367' (2024-11-19)
• Updated input 'nixvim':
    'github:nix-community/nixvim/be455f7f2714ce3479ae5bb662a03bd450f45793' (2024-11-15)
  → 'github:nix-community/nixvim/a81a03a3f5dcdcdee5cbe831a9f2e81895e92875' (2024-11-24)
• Updated input 'nixvim/git-hooks':
    'github:cachix/git-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0' (2024-11-11)
  → 'github:cachix/git-hooks.nix/3308484d1a443fc5bc92012435d79e80458fe43c' (2024-11-19)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/6c71c49e2448e51ad830ed211024e6d0edc50116' (2024-11-12)
  → 'github:lnl7/nix-darwin/698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a' (2024-11-23)
• Updated input 'nixvim/nuschtosSearch':
    'github:NuschtOS/search/135d202e032be70c93b6d7d53592ef4799d6efde' (2024-11-11)
  → 'github:NuschtOS/search/fe07070f811b717a4626d01fab714a87d422a9e1' (2024-11-18)
• Updated input 'nixvim/nuschtosSearch/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'nixvim/treefmt-nix':
    'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30)
  → 'github:numtide/treefmt-nix/705df92694af7093dfbb27109ce16d828a79155f' (2024-11-22)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4c91d52db103e757fc25b58998b0576ae702d659' (2024-11-11)
  → 'github:Mic92/sops-nix/53c853fb1a7e4f25f68805ee25c83d5de18dc699' (2024-11-21)
• Removed input 'sops-nix/nixpkgs-stable'
• Updated input 'stylix':
    'github:danth/stylix/5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f' (2024-11-15)
  → 'github:danth/stylix/b667a340730dd3d0596083aa7c949eef01367c62' (2024-11-22)
• Updated input 'stylix/base16':
    'github:SenchoPens/base16.nix/665b3c6748534eb766c777298721cece9453fdae' (2024-02-25)
  → 'github:SenchoPens/base16.nix/153d52373b0fb2d343592871009a286ec8837aec' (2024-11-21)
• Updated input 'stylix/base16/fromYaml':
    'github:SenchoPens/fromYaml/11fbbbfb32e3289d3c631e0134a23854e7865c84' (2023-07-16)
  → 'github:SenchoPens/fromYaml/106af9e2f715e2d828df706c386a685698f3223b' (2024-11-18)
2024-11-25 04:20:32 +01:00
af4e5a7127
hydra: add even more power 2024-11-24 21:14:44 +01:00
15 changed files with 332 additions and 169 deletions

View file

@ -1,4 +1,4 @@
{ ... }: {
{ inputs, ... }: {
imports = [
../../common
../../users/lucy
@ -8,6 +8,7 @@
../../services/arrs
../../services/jellyfin.nix
../../services/nginx.nix
inputs.oth.nixosModules.default
];
networking.hostName = "crime";
systemd.network.networks."98-eth-default" = {
@ -24,6 +25,7 @@
"/var/lib/radarr"
"/var/lib/sonarr"
"/var/lib/private/prowlarr"
"/home"
];
};
}

View file

@ -10,7 +10,11 @@
../../services/hydra
../../services/update-nixfiles.nix
];
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
boot.binfmt = {
preferStaticEmulators = true;
emulatedSystems = [ "aarch64-linux" "riscv64-linux" ];
};
networking.hostName = "seras";
systemd.network.networks."98-eth-default" = {

View file

@ -9,10 +9,6 @@
options snd_bcm2835 enable_headphones=1
'';
kernelParams = [ "snd_bcm2835.enable_hdmi=1" ];
loader.raspberryPi.firmwareConfig = ''
dtparam=audio=on
dtparam=krnbt=on
'';
};
console.enable = false;

View file

@ -1,8 +1,11 @@
{ lib, pkgs, ... }: {
services = {
prowlarr.enable = true;
} // lib.genAttrs [ "sonarr" "radarr" ] (_: {
services = lib.genAttrs [
"sonarr"
"radarr"
"prowlarr"
"lidarr"
] (_: {
enable = true;
});
systemd.services = lib.genAttrs [ "radarr" "sonarr" ] (_: {
@ -36,6 +39,10 @@
disableHttp3 = true;
locations = {
"/".root = pkgs.writeTextDir "index.html" (builtins.readFile ./landingPage.html);
"/lidarr/" = {
proxyPass = "http://127.0.0.1:8686";
recommendedProxySettings = true;
};
"/sonarr/" = {
proxyPass = "http://127.0.0.1:8989";
recommendedProxySettings = true;

View file

@ -19,6 +19,8 @@ working. Further configuration is required.</p>
<a href="https://crime.kyouma.net/sonarr">crime.kyouma.net/sonarr</a><br/>
Radarr
<a href="https://crime.kyouma.net/radarr">crime.kyouma.net/radarr</a><br/>
Lidarr
<a href="https://crime.kyouma.net/lidarr">crime.kyouma.net/lidarr</a><br/>
Prowlarr
<a href="https://crime.kyouma.net/prowlarr">crime.kyouma.net/prowlarr</a></p>

View file

@ -30,8 +30,8 @@
extraConfig = ''
server_store_uri = https://cache.kyouma.net
binary_cache_public_uri = https://cache.kyouma.net
evaluator_workers = 6
evaluator_max_memory_size = 12288
evaluator_workers = 1
evaluator_max_memory_size = 4096
max_output_size = ${builtins.toString (24 * 1024 * 1024 * 1024)}
'';
};
@ -44,8 +44,8 @@
};
systemd.services.hydra-evaluator.serviceConfig = {
MemoryHigh = "250G";
MemoryMax = "254G";
MemoryHigh = "150G";
MemoryMax = "155G";
};
kyouma.nginx.defaultForbidden = "hydra.kyouma.net";

View file

@ -1,6 +1,9 @@
{ config, lib, ... }: {
nix.buildMachines = let
base = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
x86-64 = [ "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ];
aarch64 = [ "gccarch-armv8-a" "gccarch-armv8.1-a" "gccarch-armv8.2-a" "gccarch-armv8.2-a+fp16+rcpc+dotprod" ];
riscv64 = [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
in [
{
hostName = "localhost";
@ -16,7 +19,7 @@
maxJobs = 2;
speedFactor = 4;
systems = [ "aarch64-linux" ];
supportedFeatures = base;
supportedFeatures = base ++ aarch64;
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
}
{
@ -25,16 +28,18 @@
maxJobs = 0;
speedFactor = 20;
systems = [ "riscv64-linux" ];
supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
supportedFeatures = base ++ riscv64;
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
}
] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: {
hostName = "build-worker-0${toString num}";
] ++ lib.forEach (lib.range 0 11) (num: {
hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
sshUser = "root";
maxJobs = 2;
speedFactor = 20;
systems = [ "i686-linux" "x86_64-linux" ];
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ];
systems = [ "i686-linux" "x86_64-linux" ]
++ lib.optionals (lib.mod num 5 == 0) [ "aarch64-linux" "riscv64-linux" ];
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" ] ++ x86-64
++ lib.optionals (lib.mod num 5 == 0) (aarch64 ++ riscv64);
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
});
nixpkgs.config.allowUnsupportedSystem = true;
@ -56,6 +61,7 @@
"schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
"lab.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUePtVPtBK+CYosufbaGiMT4EVanti4V5t2Wg0g/Fy4";
"localhost".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPNVavo3YHVsrYwXRVISu7kDoknn+5inFGySn4azlB8P";
"[build-worker-kyoumanet.fly.dev]:2200".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUGzlilikAUfUGKXVCoTeDvPRoWUgDDkNU5WaRUBzls";
"[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB";
"[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz";
"[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp";
@ -64,15 +70,18 @@
"[build-worker-kyoumanet.fly.dev]:2206".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0kxGgwOG9KhUhvxxTSiQC5YikrzZXKDgSpBw33qN4";
"[build-worker-kyoumanet.fly.dev]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY";
"[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O";
"[build-worker-kyoumanet-cdg.fly.dev]:2209".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGlQD/3fLn/Kyb7v0RIycHRcArGi75jURj803EMpW0S";
"[build-worker-kyoumanet-cdg.fly.dev]:2210".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQm1FSGBGdCR5f8MvBvdKM0M4yIQVnH1po7hHO5T1qz";
"[build-worker-kyoumanet-cdg.fly.dev]:2211".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlH+v2ZlcDQY3itw4b7aRbwRTqDsTE0R5Ua3vF0VaGr";
};
extraConfig = ''
Host machine-0008.cloud-v.co
Hostname machine.cloud-v.co
Port 20008
'' + lib.concatLines (lib.genList (i: ''
Host build-worker-0${toString (i + 1)}
Hostname build-worker-kyoumanet.fly.dev
Port 220${toString (i + 1)}
'') 8);
'' + lib.concatLines (lib.forEach (lib.range 0 11) (num: ''
Host build-worker-${lib.fixedWidthNumber 2 num}
Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
Port 22${lib.fixedWidthNumber 2 num}
''));
};
}

View file

@ -30,11 +30,11 @@
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1708890466,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"lastModified": 1732200724,
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae",
"rev": "153d52373b0fb2d343592871009a286ec8837aec",
"type": "github"
},
"original": {
@ -78,11 +78,11 @@
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1716150083,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"lastModified": 1731949548,
"narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
"type": "github"
},
"original": {
@ -156,11 +156,11 @@
]
},
"locked": {
"lastModified": 1731549112,
"narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=",
"lastModified": 1732742778,
"narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
"owner": "nix-community",
"repo": "disko",
"rev": "5fd852c4155a689098095406500d0ae3d04654a8",
"rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
"type": "github"
},
"original": {
@ -192,6 +192,26 @@
"type": "github"
}
},
"eosyn": {
"inputs": {
"lix": "lix",
"lix-module": "lix-module",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1732835047,
"narHash": "sha256-O+JD5tKyCRtE+ZY5cpDQnepcyEP3xDxqSw4irJRxRgM=",
"ref": "refs/heads/main",
"rev": "29adbc654463e677bc8bfbfa311c765584446bd8",
"revCount": 1,
"type": "git",
"url": "https://woof.rip/mikael/eosyn.git"
},
"original": {
"type": "git",
"url": "https://woof.rip/mikael/eosyn.git"
}
},
"fernglas": {
"inputs": {
"communities": "communities",
@ -216,17 +236,14 @@
},
"firefox": {
"inputs": {
"neoidiosyn": "neoidiosyn",
"nixpkgs": [
"nixpkgs"
]
"eosyn": "eosyn"
},
"locked": {
"lastModified": 1731867603,
"narHash": "sha256-07612Ws2V4iFQAGLEoZVIefA3rM9JP3B/qo/z4tu1Kg=",
"lastModified": 1732835073,
"narHash": "sha256-6pF35LT6oLTFTuwJ4ZxjePY+qHpC4BGcOExJeiUAlxY=",
"ref": "refs/heads/main",
"rev": "022ec0becb1ca7b96ddb9bdd046617075357c2cb",
"revCount": 3,
"rev": "cf453c076add9ee34542a318fa7a7a865087921b",
"revCount": 4,
"type": "git",
"url": "https://woof.rip/mikael/firefox.git"
},
@ -284,11 +301,11 @@
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@ -366,11 +383,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -402,11 +419,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@ -420,11 +437,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -441,11 +458,11 @@
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -531,11 +548,11 @@
]
},
"locked": {
"lastModified": 1731611636,
"narHash": "sha256-Do8vpR8JTpkPr9vxf1aRzhb4/cUBjg5twPyGDyezxJw=",
"lastModified": 1732211216,
"narHash": "sha256-eXsk0hZ2sFAvQht9W6Xxej/8AHYCGzvATFLoY1xwG/o=",
"ref": "refs/heads/main",
"rev": "32e1061cb2ef3cd0eab0bd99f062a2776a73d459",
"revCount": 7,
"rev": "81f0a4377c1218d328e7996636a02faf0597efa0",
"revCount": 9,
"type": "git",
"url": "https://woof.rip/florp/moderation.git"
},
@ -547,11 +564,11 @@
"fromYaml": {
"flake": false,
"locked": {
"lastModified": 1689549921,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
"lastModified": 1731966426,
"narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
"rev": "106af9e2f715e2d828df706c386a685698f3223b",
"type": "github"
},
"original": {
@ -577,11 +594,11 @@
]
},
"locked": {
"lastModified": 1731363552,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"lastModified": 1732021966,
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github"
},
"original": {
@ -636,11 +653,11 @@
]
},
"locked": {
"lastModified": 1731604581,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"lastModified": 1732793095,
"narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"rev": "2f7739d01080feb4549524e8f6927669b61c6ee3",
"type": "github"
},
"original": {
@ -655,7 +672,7 @@
"lix"
],
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1728215710,
@ -727,11 +744,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1731683711,
"narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
"rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
"lastModified": 1732806742,
"narHash": "sha256-2RNOVB3UIIxxjiFKrEqSgnSoHK+olbw2o5g/63dDjJ8=",
"rev": "f5754dc90ae9b1207656d0e29ad2704d3ef1e554",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f5754dc90ae9b1207656d0e29ad2704d3ef1e554.tar.gz?rev=f5754dc90ae9b1207656d0e29ad2704d3ef1e554"
},
"original": {
"type": "tarball",
@ -744,21 +761,21 @@
"flakey-profile": "flakey-profile",
"lix": [
"firefox",
"neoidiosyn",
"eosyn",
"lix"
],
"nixpkgs": [
"firefox",
"neoidiosyn",
"eosyn",
"nixpkgs"
]
},
"locked": {
"lastModified": 1731185731,
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
"lastModified": 1732603698,
"narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
"rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730"
},
"original": {
"type": "tarball",
@ -775,72 +792,49 @@
]
},
"locked": {
"lastModified": 1723510904,
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
"lastModified": 1729360442,
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
"rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
}
},
"lix_2": {
"inputs": {
"flake-compat": "flake-compat_2",
"nix2container": "nix2container",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs-regression": "nixpkgs-regression",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1723503926,
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"lastModified": 1729298361,
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
}
},
"lix_3": {
"flake": false,
"locked": {
"lastModified": 1723503926,
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"lastModified": 1729298361,
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
}
},
"neoidiosyn": {
"inputs": {
"lix": "lix",
"lix-module": "lix-module",
"nixpkgs": [
"firefox",
"nixpkgs"
]
},
"locked": {
"lastModified": 1731867586,
"narHash": "sha256-6anSWv1Vw83RKMAFMHOCv/9pp23ExzscEKFAe+GbAmU=",
"ref": "refs/heads/main",
"rev": "86605e5489fb5045f4dee48de2a69082e17c033b",
"revCount": 1,
"type": "git",
"url": "https://woof.rip/mikael/neoidiosyn.git"
},
"original": {
"type": "git",
"url": "https://woof.rip/mikael/neoidiosyn.git"
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
}
},
"nix-darwin": {
@ -851,11 +845,11 @@
]
},
"locked": {
"lastModified": 1731454423,
"narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
"lastModified": 1732603785,
"narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
"rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
"type": "github"
},
"original": {
@ -953,11 +947,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1731403644,
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
"lastModified": 1732483221,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "f6581f1c3b137086e42a08a906bdada63045f991",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
"type": "github"
},
"original": {
@ -1034,23 +1028,23 @@
"type": "github"
}
},
"nixpkgs-stable_2": {
"nixpkgs_2": {
"locked": {
"lastModified": 1730602179,
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
"lastModified": 1732617236,
"narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
"rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs_3": {
"locked": {
"lastModified": 1725001927,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
@ -1066,7 +1060,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1721931987,
"narHash": "sha256-1Zg8LY0T5EfXtv0Kf4M6SFnjH7Eto4VV+EKJ/YSnhiI=",
@ -1082,13 +1076,13 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1731319897,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github"
},
"original": {
@ -1115,11 +1109,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1731707185,
"narHash": "sha256-IfA3x0eL4Be/7hvdvGSnT8fgiXz7GL3PtjGw3BH68gM=",
"lastModified": 1732838896,
"narHash": "sha256-9YfEyCU2wB/aSbtpZ+OHb++xS2Km970Ja33H13oEaWM=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "be455f7f2714ce3479ae5bb662a03bd450f45793",
"rev": "05331006a42846d6e55129b642485f45f90c9efc",
"type": "github"
},
"original": {
@ -1138,11 +1132,11 @@
]
},
"locked": {
"lastModified": 1731347683,
"narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=",
"lastModified": 1731936508,
"narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
"owner": "NuschtOS",
"repo": "search",
"rev": "135d202e032be70c93b6d7d53592ef4799d6efde",
"rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
"type": "github"
},
"original": {
@ -1151,6 +1145,29 @@
"type": "github"
}
},
"oth": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1732215904,
"narHash": "sha256-bXXoyQcVMULYOj1KlzbquUyMTyByzmLatIgm0ra/7sk=",
"ref": "refs/heads/main",
"rev": "847cc8493f7f44bd5ada0283d6b96457f4ee5a9b",
"revCount": 1,
"type": "git",
"url": "ssh://forgejo@woof.rip/emily/oth.git"
},
"original": {
"type": "git",
"url": "ssh://forgejo@woof.rip/emily/oth.git"
}
},
"pre-commit-hooks": {
"flake": false,
"locked": {
@ -1185,8 +1202,9 @@
"lix-module": "lix-module_2",
"nixos-hardware": "nixos-hardware",
"nixos-needsreboot": "nixos-needsreboot",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"nixvim": "nixvim",
"oth": "oth",
"sops-nix": "sops-nix",
"stylix": "stylix"
}
@ -1195,15 +1213,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
]
},
"locked": {
"lastModified": 1731364708,
"narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
"lastModified": 1732575825,
"narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "4c91d52db103e757fc25b58998b0576ae702d659",
"rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
"type": "github"
},
"original": {
@ -1233,11 +1250,11 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1731657386,
"narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=",
"lastModified": 1732608183,
"narHash": "sha256-T5k5ill+PNIEW6KuS4CpUacMtZNJe2J2q5eBOF4xWuU=",
"owner": "danth",
"repo": "stylix",
"rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f",
"rev": "7689e621f87bce7b6ab1925dfd70ad1f4c80f334",
"type": "github"
},
"original": {
@ -1358,11 +1375,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"lastModified": 1729501581,
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
"type": "github"
},
"original": {
@ -1401,11 +1418,11 @@
]
},
"locked": {
"lastModified": 1730321837,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"lastModified": 1732643199,
"narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c",
"type": "github"
},
"original": {

View file

@ -50,9 +50,9 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
lix.url = "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz";
lix.url = "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-needsreboot = {
@ -64,6 +64,11 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
oth = {
url = "git+ssh://forgejo@woof.rip/emily/oth.git";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -5,6 +5,7 @@ primary_region = 'ams'
image = 'registry.fly.io/build-worker-kyoumanet:latest'
[processes]
bw-00 = '/entrypoint.sh'
bw-01 = '/entrypoint.sh'
bw-02 = '/entrypoint.sh'
bw-03 = '/entrypoint.sh'
@ -14,28 +15,34 @@ primary_region = 'ams'
bw-07 = '/entrypoint.sh'
bw-08 = '/entrypoint.sh'
[[mounts]]
source = 'bw00'
destination = '/mnt/data'
initial_size = '256GB'
processes = ['bw-00']
[[mounts]]
source = 'bw01'
destination = '/mnt/data'
initial_size = '128GB'
initial_size = '256GB'
processes = ['bw-01']
[[mounts]]
source = 'bw02'
destination = '/mnt/data'
initial_size = '128GB'
initial_size = '256GB'
processes = ['bw-02']
[[mounts]]
source = 'bw03'
destination = '/mnt/data'
initial_size = '128GB'
initial_size = '256GB'
processes = ['bw-03']
[[mounts]]
source = 'bw04'
destination = '/mnt/data'
initial_size = '128GB'
initial_size = '256GB'
processes = ['bw-04']
[[mounts]]
@ -62,6 +69,15 @@ primary_region = 'ams'
initial_size = '256GB'
processes = ['bw-08']
[[services]]
protocol = 'tcp'
internal_port = 2222
auto_stop_machines = 'off'
processes = ['bw-00']
[[services.ports]]
port = 2200
[[services]]
protocol = 'tcp'
internal_port = 2222

View file

@ -0,0 +1,67 @@
# fly.toml app configuration file generated for build-worker-kyoumanet-cdg on 2024-11-21T00:31:54+01:00
#
# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
#
app = 'build-worker-kyoumanet-cdg'
primary_region = 'cdg'
[build]
image = 'registry.fly.io/build-worker-kyoumanet:latest'
[processes]
bw-09 = '/entrypoint.sh'
bw-10 = '/entrypoint.sh'
bw-11 = '/entrypoint.sh'
[[mounts]]
source = 'bw09'
destination = '/mnt/data'
initial_size = '256GB'
processes = ['bw-09']
[[mounts]]
source = 'bw10'
destination = '/mnt/data'
initial_size = '256GB'
processes = ['bw-10']
[[mounts]]
source = 'bw11'
destination = '/mnt/data'
initial_size = '256GB'
processes = ['bw-11']
[[services]]
protocol = 'tcp'
internal_port = 2222
auto_stop_machines = 'off'
processes = ['bw-09']
[[services.ports]]
port = 2209
[[services]]
protocol = 'tcp'
internal_port = 2222
auto_stop_machines = 'off'
processes = ['bw-10']
[[services.ports]]
port = 2210
[[services]]
protocol = 'tcp'
internal_port = 2222
auto_stop_machines = 'off'
processes = ['bw-11']
[[services.ports]]
port = 2211
[[restart]]
policy = 'never'
[[vm]]
size = 'performance-16x'
memory = '96GB'

View file

@ -1,11 +1,13 @@
# I hate this so much aaa
{
lib,
callPackage,
dockerTools,
openssh,
bash,
gnused,
util-linux,
qemu-user
}:
dockerTools.buildLayeredImage {
@ -20,11 +22,28 @@ dockerTools.buildLayeredImage {
enableFakechroot = true;
contents = [ openssh util-linux bash gnused ];
contents = [ openssh util-linux bash gnused qemu-user ];
config.Cmd = [ "/entrypoint.sh" ];
fakeRootCommands = ''
fakeRootCommands = let
system-features = [
"benchmark"
"big-parallel"
"nixos-test"
"uid-range"
"gccarch-x86-64"
"gccarch-x86-64-v2"
"gccarch-x86-64-v3"
"gccarch-armv8-a"
"gccarch-armv8.1-a"
"gccarch-armv8.2-a"
"gccarch-armv8.2-a+fp16+rcpc+dotprod"
"gccarch-rv64imac"
"gccarch-rv64imacfd"
"gccarch-rv64gc"
];
in ''
mkdir -p /root
cat <<EOF > /root/nix.conf
build-users-group = nixbld
@ -36,7 +55,8 @@ dockerTools.buildLayeredImage {
max-silent-time = 14400
min-free = ${builtins.toString (49152 * 1024 * 1024)}
max-free = ${builtins.toString (65536 * 1024 * 1024)}
system-features = benchmark big-parallel kvm nixos-test uid-range gccarch-x86-64 gccarch-x86-64-v2 gccarch-x86-64-v3
extra-platforms = aarch64-linux i686-linux riscv64-linux
system-features = ${toString system-features}
EOF
mkdir -p /root/.ssh
@ -94,7 +114,9 @@ dockerTools.buildLayeredImage {
mkdir -p /var/empty
mkdir -p /var/log
cp ${./entrypoint.sh} /entrypoint.sh
substitute ${./entrypoint.sh} /entrypoint.sh \
--subst-var-by qemu-aarch64 ${lib.getExe' qemu-user "qemu-aarch64"} \
--subst-var-by qemu-riscv64 ${lib.getExe' qemu-user "qemu-riscv64"}
chmod +x /entrypoint.sh
'';
}

View file

@ -26,4 +26,14 @@ cp /root/nix.conf /etc/nix/nix.conf
/bin/mount -t overlay overlay -o lowerdir=/nix,upperdir=/mnt/data/nix-store,workdir=/mnt/data/workdir /nix
/bin/mount --bind /mnt/data/tmp /tmp
# Register QEMU binaries for user mode emulation
aarch64_magic='\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00'
aarch64_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
riscv64_magic='\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'
riscv64_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
echo ":qemu-aarch64:M::$aarch64_magic:$aarch64_mask:@qemu-aarch64@:POCF" >/proc/sys/fs/binfmt_misc/register
echo ":qemu-riscv64:M::$riscv64_magic:$riscv64_mask:@qemu-riscv64@:POCF" >/proc/sys/fs/binfmt_misc/register
/root/.nix-profile/bin/sshd -D -f /root/sshd_config

View file

@ -2,7 +2,11 @@ final: prev: {
nyastodon = final.callPackage ./nyastodon/default.nix {};
upgrade-system = final.callPackage ./upgrade-system/default.nix {};
update-nixfiles = final.callPackage ./update-nixfiles/default.nix {};
build-worker-oci = final.callPackage ./build-worker-oci/default.nix {};
build-worker-oci = final.callPackage ./build-worker-oci/default.nix {
qemu-user = final.pkgsStatic.qemu-user.override {
hostCpuTargets = [ "aarch64-linux-user" "riscv64-linux-user" ];
};
};
librespeed-rust = final.callPackage ./librespeed-rust/default.nix {};
librespeed-go = final.callPackage ./librespeed-go/default.nix {};
akkoma-fe-domi = final.callPackage ./akkoma-fe-domi/default.nix {};

View file

@ -23,7 +23,9 @@ merge_theirs () {
test_build () {
local build_jobs
build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")"
sleep 30
build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/evals" | jq -r ".evals | max_by(.id) | .builds | .[]")"
for build in ${build_jobs}; do
local build_status