From b32ddfa0a1801a5e065f2f2a7b6e9593054ee53e Mon Sep 17 00:00:00 2001 From: emily Date: Thu, 10 Oct 2024 18:06:11 +0200 Subject: [PATCH] graphical, fly.toml: fixes --- config/services/hydra/nix-config.nix | 12 ++++++------ fly.toml | 1 + modules/graphical/nixvim.nix | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index 73e47de..8e97e97 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" ] (num: { hostName = "build-worker-${num}"; sshUser = "root"; maxJobs = 4; 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; }); @@ -61,10 +61,10 @@ 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 ''; diff --git a/fly.toml b/fly.toml index 4cf700a..2eccb36 100644 --- a/fly.toml +++ b/fly.toml @@ -75,3 +75,4 @@ primary_region = 'ams' [[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;