diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index 73e47de..016887b 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -17,8 +17,8 @@ supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } - ] ++ lib.forEach [ "03" "04" ] (num: { - hostName = "build-worker-${num}.nyantec.com"; + { + hostName = "build-worker-04.nyantec.com"; sshUser = "nix-ssh"; maxJobs = 4; speedFactor = 18; @@ -26,12 +26,12 @@ supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } - ) ++ lib.forEach [ "01" "02" "05" "06" ] (num: { + ] ++ lib.forEach [ "01" "02" "03" "05" "06" "07" "08" "09" ] (num: { hostName = "build-worker-${num}"; sshUser = "root"; - maxJobs = 4; + maxJobs = 2; speedFactor = 20; - systems = [ "x86_64-linux" ]; + systems = [ "i686-linux" "x86_64-linux" ]; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; }); @@ -53,6 +53,10 @@ "[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz"; "[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp"; "[build-worker-kyoumanet.fly.dev]:2204".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN72OyD9LYy4hq0WZ7ie5RPV+G54UreEJiA/RubjGoe9"; + "[build-worker-kyoumanet.fly.dev]:2205".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNh1o1I98XrI2XmOI6Q0aHPfyLCIQwKkKOxGUUeXL9v"; + "[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"; }; extraConfig = '' Host build-worker-01 @@ -61,12 +65,24 @@ Host build-worker-02 Hostname build-worker-kyoumanet.fly.dev Port 2202 - Host build-worker-05 + Host build-worker-03 Hostname build-worker-kyoumanet.fly.dev Port 2203 - Host build-worker-06 + Host build-worker-05 Hostname build-worker-kyoumanet.fly.dev Port 2204 + Host build-worker-06 + Hostname build-worker-kyoumanet.fly.dev + Port 2205 + Host build-worker-07 + Hostname build-worker-kyoumanet.fly.dev + Port 2206 + Host build-worker-08 + Hostname build-worker-kyoumanet.fly.dev + Port 2207 + Host build-worker-09 + Hostname build-worker-kyoumanet.fly.dev + Port 2208 ''; }; } diff --git a/flake.lock b/flake.lock index 36316ea..172066e 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728241390, - "narHash": "sha256-icNt2T1obK3hFNgBOgiiyOoiScUfz9blmRbNp3aOUBE=", + "lastModified": 1728577371, + "narHash": "sha256-f3bKclEV5t1eP1OH7kTGv/tLzlToSRIe0ktkdl1jihw=", "owner": "zhaofengli", "repo": "attic", - "rev": "1b29816235b7573fca7f964709fd201e1a187024", + "rev": "e5c8d2d50981a34602358d917e7be011b2c397a8", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1728598744, + "narHash": "sha256-sSfvyO5xH3HObHHmh6lp/hcvo7tMjFKd/HXpxyrRnoE=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "342a1d682386d3a1d74f9555cb327f2f311dda6e", "type": "github" }, "original": { @@ -874,11 +874,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -905,11 +905,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1728485062, - "narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=", + "lastModified": 1728593423, + "narHash": "sha256-xM3+7mvWwM5i+RXD97wQ/fSoQDFidVxNszIfKIv9msE=", "owner": "nix-community", "repo": "nixvim", - "rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135", + "rev": "af650ba9401501352d6eaaced192bbb4abfaec87", "type": "github" }, "original": { @@ -927,11 +927,11 @@ ] }, "locked": { - "lastModified": 1728423244, - "narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=", + "lastModified": 1728513479, + "narHash": "sha256-yAR9M1jvuAoahYNxo3RNnPMcua1TAIPurFKmH2/g3lg=", "owner": "NuschtOS", "repo": "search", - "rev": "f276cc3b391493ba3a8b30170776860f9520b7fa", + "rev": "5cb7ef512ec20a5b7d60fc70dba014560559698a", "type": "github" }, "original": { diff --git a/fly.toml b/fly.toml index 4cf700a..b796763 100644 --- a/fly.toml +++ b/fly.toml @@ -9,6 +9,10 @@ primary_region = 'ams' bw-02 = '/entrypoint.sh' bw-03 = '/entrypoint.sh' bw-04 = '/entrypoint.sh' + bw-05 = '/entrypoint.sh' + bw-06 = '/entrypoint.sh' + bw-07 = '/entrypoint.sh' + bw-08 = '/entrypoint.sh' [[mounts]] source = 'bw01' @@ -34,6 +38,30 @@ primary_region = 'ams' initial_size = '128GB' processes = ['bw-04'] +[[mounts]] + source = 'bw05' + destination = '/mnt/data' + initial_size = '256GB' + processes = ['bw-05'] + +[[mounts]] + source = 'bw06' + destination = '/mnt/data' + initial_size = '256GB' + processes = ['bw-06'] + +[[mounts]] + source = 'bw07' + destination = '/mnt/data' + initial_size = '256GB' + processes = ['bw-07'] + +[[mounts]] + source = 'bw08' + destination = '/mnt/data' + initial_size = '256GB' + processes = ['bw-08'] + [[services]] protocol = 'tcp' internal_port = 2222 @@ -70,8 +98,45 @@ primary_region = 'ams' [[services.ports]] port = 2204 +[[services]] + protocol = 'tcp' + internal_port = 2222 + auto_stop_machines = 'off' + processes = ['bw-05'] + + [[services.ports]] + port = 2205 + +[[services]] + protocol = 'tcp' + internal_port = 2222 + auto_stop_machines = 'off' + processes = ['bw-06'] + + [[services.ports]] + port = 2206 + +[[services]] + protocol = 'tcp' + internal_port = 2222 + auto_stop_machines = 'off' + processes = ['bw-07'] + + [[services.ports]] + port = 2207 + +[[services]] + protocol = 'tcp' + internal_port = 2222 + auto_stop_machines = 'off' + processes = ['bw-08'] + + [[services.ports]] + port = 2208 + [[restart]] policy = 'never' [[vm]] size = 'performance-16x' + memory = '96GB' diff --git a/modules/graphical/nixvim.nix b/modules/graphical/nixvim.nix index a947ee4..415ca5b 100644 --- a/modules/graphical/nixvim.nix +++ b/modules/graphical/nixvim.nix @@ -211,6 +211,7 @@ plugins.luasnip.enable = true; plugins.nvim-autopairs.enable = true; plugins.rainbow-delimiters.enable = true; + plugins.web-devicons.enable = true; # Broken plugins.rustaceanvim.enable = false; plugins.treesitter-context.enable = true; diff --git a/pkgs/build-worker-oci/default.nix b/pkgs/build-worker-oci/default.nix index a5ea5b4..d246d0b 100644 --- a/pkgs/build-worker-oci/default.nix +++ b/pkgs/build-worker-oci/default.nix @@ -42,6 +42,7 @@ dockerTools.buildLayeredImage { mkdir -p /root/.ssh cat < /root/.ssh/authorized_keys ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/+iN407+HsfHbbC3tfdA8Yf4TZ08qXQMb4tb/SDAs+ emily@card + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK397sBHLS66snWNPtmjUy7qZxRJh54N0RRXogKODudl nix@muon ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/vCXM3IaxJP9v2Y+xcQrQD2IcffgdzqtWhpMjj9Xl5 hydra@seras ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICT0dGyLUjxFnvqUmex+5xUGQ7D4yGHKo267JgApcq0k root@ryuuko ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDTwCSWYODyvTJxwB6Rahuy0j6s/YYwtQta8bjzG/We root@ryuuko-arch diff --git a/pkgs/build-worker-oci/source.nix b/pkgs/build-worker-oci/source.nix index 55d1997..b6a86fc 100644 --- a/pkgs/build-worker-oci/source.nix +++ b/pkgs/build-worker-oci/source.nix @@ -4,8 +4,8 @@ dockerTools.pullImage { imageName = "nixos/nix"; - imageDigest = "sha256:338ca39c0c75f10919cd0cf38647ce4543033d2bbdabab4519de5adee45445f8"; - sha256 = "0rzms97xnzlh63pjkqq3m5146lyw00mqgdldsd00c9bzk3ybr75x"; + imageDigest = "sha256:fd7a5c67d396fe6bddeb9c10779d97541ab3a1b2a9d744df3754a99add4046f1"; + sha256 = "1ggkwd9zw8lj97ig7zah7dqy463hfhsgq3iwxxf8117gf8xi422s"; finalImageName = "nixos/nix"; finalImageTag = "latest"; }