13 changed files with 72 additions and 190 deletions
--- a/config/common/users/emily/default.nix
+++ b/config/common/users/emily/default.nix
@ -62,7 +62,7 @@

    programs.eza = {
      enable = true;
-      icons = "auto";
+      icons = true;
      git = true;
      extraOptions = [
        "--color-scale=all"
--- a/config/hosts/_minimal/configuration.nix
+++ b/config/hosts/_minimal/configuration.nix
@ -52,7 +52,7 @@

    programs.eza = {
      enable = true;
-      icons = "auto";
+      icons = true;
      git = true;
      extraOptions = [
        "--color-scale=all"
--- a/config/hosts/emilia/disko.nix
+++ b/config/hosts/emilia/disko.nix
@ -62,7 +62,6 @@
            };
          };
          root = {
-            type = "8300";
            size = "100%";
          };
        };
--- a/config/hosts/integra/configuration.nix
+++ b/config/hosts/integra/configuration.nix
@ -18,11 +18,6 @@

  nix.sshServe.keys = [
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOWlYhnummuWZbq3+d0x5A67YvlPvtl7/1Dk4RtNlzf christina@cafkafk.com"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/RmFnel8pcZT9nh7EAfKfAekt3BoEXy0G7G2GTacN/ aprl@computer"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxsX+lEWkHZt9NOvn9yYFP0Z++186LY4b97C4mwj/f2 aprl@whatever"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpyVefbZLkNVNzdSIlO6x6JohHE1snoHiUB3Qdvl5I2 aprl@idk"
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVNo871p97NTefP52KYiwuch+FaVScxvcFd9fg0yykySTq7Y5JsxrJQgTnox/oDa0O87OyHD/GHQljAXkqiHpDkExbiGjDmGXJSKReKH061F4FqBnDIwYRzUu9Cxjl4MNqsU0RqLaz4+F42c/L7GROQwjEPUb8JHThRiI5FJnDvvB+oBLBxeyQA4v3O4i8DaDQayTr/XB+aSlhNwKrb6cjjL93AHT1uE53yY5jn4kZX+RiPQhH7rvt9N6E4Yr3CG6nUgRCUS0L66d9yfrq0XAbAVk9F+viV7Nk9qy4MWHtXZ4h0qUlzrGALPgGsCGiLGd4NvEgeCcV4nvxdmevxTSdKlJP75xlmlLVXGyhqCZkTsxm/png2UvDl+p0pLyrgNaNoXPdE0Jbv7C28WX36Nast1QFSMUhexzuOx8OgaOioeXVfK98AouqWb58iPBCvgreUIH/gJhZcnlB/Foo1KSO+fJNH8hAsLH7w0mnKyHhJjkrjjwUqsnpepB3SOLfZTE= aprl@meow"
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0v3tUBNEUxfoOQBFb+N2DUBQDay0iFggUWa9Nd+BtFLOKkz+RRto3eBF0ZiJZVUxv/hLb8m2s45hcMw8agwuPrXMe5085T1fzkvPdKAPZdsT/cCmBi1OsoLjAKBFIdM4lcV0A2cca8hip+/ZPpjFPUWx73/672gAPHU7co7fP8+8CSf9dx+WIeLx3yaYHYZ/th3dB5auX3VjOazS8MojsAorwTUeBoPamHQ5dFeNafhFUL/hhtGkUI1cNHUn3bJd2V7AKTW3UglK7hVgMJPrzVS31OlpcJEf6S5XgKTWdOSwubn1bs5Lt6YYRDU24NV6CGrwKgCJSRxzNMLwpnFKiSXpO8FzkqWHYWyju141hQcFF31aZIV+7YcwEt5ZukLjFOpVtpbSXvJYigOUzGi34P3/OAGshDXjTQjvM8GIir49gx3b2Nwhg0z4UHBkAKZvDDFPHDMJoclvnhITojaAojfC9zmMCO5ZaEsk8yv7c/lWQumzRpfldWF4mwHvhD5kTADbhRdO7WTdX7AaiAYINooToeWKjFe2wn3rFubPUppptqtP03mmvs7vhhgnEVBbGZRJK3GTVk1XcsfF9rDKzewSa+wb4LsBoZtFRhc8cJqHGlKWSNk7dQ04B1atPyNLKGpGoo/UIPxyZ6bSqFVxY3nhz46VZ6z8XWI48z0/fRQ== aprl@uwu"
  ];

  systemd.network.networks."98-eth-default" = {
--- a/config/hosts/seras/configuration.nix
+++ b/config/hosts/seras/configuration.nix
@ -21,26 +21,6 @@
    ];
  };

-  services.postgresql.settings = {
-    max_connections = 200;
-    shared_buffers = "24GB";
-    effective_cache_size = "72GB";
-    maintenance_work_mem = "2GB";
-    checkpoint_completion_target = 0.9;
-    wal_buffers = "16MB";
-    default_statistics_target = 100;
-    random_page_cost = 1.1;
-    effective_io_concurrency = 200;
-    work_mem = "31457kB";
-    huge_pages = "try";
-    min_wal_size = "1GB";
-    max_wal_size = "4GB";
-    max_worker_processes = 32;
-    max_parallel_workers_per_gather = 4;
-    max_parallel_workers = 32;
-    max_parallel_maintenance_workers = 4;
-  };
-
  kyouma.ooklaserver = {
    enable = true;
    openFirewall = true;
--- a/config/services/hydra/default.nix
+++ b/config/services/hydra/default.nix
@ -1,7 +1,6 @@
 { config, inputs, lib, ... }: {
  imports = [
    ./nix-config.nix
-    inputs.hydra.nixosModules.hydra
  ];
  sops.secrets."services/hydra/signKey" = {
    owner = "hydra-queue-runner";
@ -19,7 +18,7 @@
  };
  kyouma.deployment.auto-upgrade.cache = "daemon";

-  services.hydra-dev = {
+  services.hydra = {
    enable = true;
    package = inputs.hydra.packages.${config.nixpkgs.hostPlatform.system}.hydra;
    hydraURL = "https://hydra.kyouma.net";
--- 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;
    }
-    {
-      hostName = "build-worker-04.nyantec.com";
+  ] ++ lib.forEach [ "03" "04" ] (num: {
+      hostName = "build-worker-${num}.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" "03" "05" "06" "07" "08" "09" ] (num: {
+  ) ++ lib.forEach [ "01" "02" "05" "06" ] (num: {
      hostName = "build-worker-${num}";
      sshUser = "root";
-      maxJobs = 2;
+      maxJobs = 4;
      speedFactor = 20;
-      systems = [ "i686-linux" "x86_64-linux" ];
+      systems = [ "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,10 +53,6 @@
      "[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
@ -65,24 +61,12 @@
      Host build-worker-02
        Hostname build-worker-kyoumanet.fly.dev
        Port 2202
-      Host build-worker-03
-        Hostname build-worker-kyoumanet.fly.dev
-        Port 2203
      Host build-worker-05
        Hostname build-worker-kyoumanet.fly.dev
-        Port 2204
+        Port 2203
      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
+        Port 2204
    '';
  };
 }
--- a/flake.lock
+++ b/flake.lock
@ -11,11 +11,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1729116596,
-        "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=",
+        "lastModified": 1726069220,
+        "narHash": "sha256-dAUWlC8uMJX9iovycfvJcg5nm3PzqJIRAOwN4z322zM=",
        "owner": "zhaofengli",
        "repo": "attic",
-        "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782",
+        "rev": "416687e59c4f0b32742423458cab2c5ff8fe748a",
        "type": "github"
      },
      "original": {
@ -135,11 +135,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
        "type": "github"
      },
      "original": {
@ -155,11 +155,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729099656,
-        "narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=",
+        "lastModified": 1727977578,
+        "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b",
+        "rev": "574400001b3ffe555c7a21e0ff846230759be2ed",
        "type": "github"
      },
      "original": {
@ -462,11 +462,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728778939,
-        "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
+        "lastModified": 1727805723,
+        "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
+        "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3",
        "type": "github"
      },
      "original": {
@ -521,11 +521,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729174520,
-        "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=",
+        "lastModified": 1727817100,
+        "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268",
+        "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9",
        "type": "github"
      },
      "original": {
@ -543,19 +543,17 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1728215710,
-        "narHash": "sha256-TRxR6zELQoUDPhLkmBU8QjgskNyVcblKgQIxhuOyNRc=",
-        "ref": "main",
-        "rev": "799441dcf6d595efb0def686ca0815aef398627b",
-        "revCount": 4217,
+        "lastModified": 1724696781,
+        "narHash": "sha256-oDLfi7PdElAdhGK8i+mQ4OOn6Hu3vzHiYnuFcHoJ0IU=",
+        "ref": "refs/heads/main",
+        "rev": "ab6d81fad404af05dfeae7f74d1783a2f7367826",
+        "revCount": 4205,
        "type": "git",
-        "url": "https://git.lix.systems/lix-project/hydra"
+        "url": "https://git.lix.systems/snaakey/hydra.git"
      },
      "original": {
-        "ref": "main",
-        "rev": "799441dcf6d595efb0def686ca0815aef398627b",
        "type": "git",
-        "url": "https://git.lix.systems/lix-project/hydra"
+        "url": "https://git.lix.systems/snaakey/hydra.git"
      }
    },
    "iceshrimp": {
@ -664,11 +662,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728901530,
-        "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=",
+        "lastModified": 1727707210,
+        "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6",
+        "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3",
        "type": "github"
      },
      "original": {
@ -745,11 +743,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1728729581,
-        "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
+        "lastModified": 1727665282,
+        "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
+        "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
        "type": "github"
      },
      "original": {
@ -828,11 +826,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1728156290,
-        "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
+        "lastModified": 1725762081,
+        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "17ae88b569bb15590549ff478bab6494dde4a907",
+        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
        "type": "github"
      },
      "original": {
@ -844,11 +842,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1725001927,
-        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
+        "lastModified": 1723688146,
+        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
+        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
        "type": "github"
      },
      "original": {
@ -876,11 +874,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
        "type": "github"
      },
      "original": {
@ -907,11 +905,11 @@
        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1729196897,
-        "narHash": "sha256-xftdQl0kxWJZNWCDSl0pU2E7zCmGjhD/N9ZWgPXK0A0=",
+        "lastModified": 1727871072,
+        "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "3c7b6ae5d1524c691a1b65f7290facd0dc296e40",
+        "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd",
        "type": "github"
      },
      "original": {
@ -929,11 +927,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728905062,
-        "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=",
+        "lastModified": 1727599661,
+        "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84",
+        "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062",
        "type": "github"
      },
      "original": {
@ -987,11 +985,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1728345710,
-        "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
+        "lastModified": 1727734513,
+        "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
+        "rev": "3198a242e547939c5e659353551b0668ec150268",
        "type": "github"
      },
      "original": {
@ -1021,11 +1019,11 @@
        "tinted-tmux": "tinted-tmux"
      },
      "locked": {
-        "lastModified": 1728900372,
-        "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=",
+        "lastModified": 1727723275,
+        "narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d",
+        "rev": "e7e97059776da7e34b739415a7bc8f80f606b803",
        "type": "github"
      },
      "original": {
@ -1113,17 +1111,16 @@
    "tinted-kitty": {
      "flake": false,
      "locked": {
-        "lastModified": 1716423189,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
+        "lastModified": 1665001328,
+        "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
        "owner": "tinted-theming",
        "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
+        "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
        "type": "github"
      },
      "original": {
        "owner": "tinted-theming",
        "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
        "type": "github"
      }
    },
@ -1173,11 +1170,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727984844,
-        "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
+        "lastModified": 1727431250,
+        "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
+        "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -26,7 +26,7 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    hydra = {
-      url = "git+https://git.lix.systems/lix-project/hydra?ref=main&rev=799441dcf6d595efb0def686ca0815aef398627b";
+      url = "git+https://git.lix.systems/snaakey/hydra.git";
      inputs.lix.follows = "lix";
    };
    iceshrimp = {
--- a/fly.toml
+++ b/fly.toml
@ -9,10 +9,6 @@ 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'
@ -38,30 +34,6 @@ 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
@ -98,45 +70,8 @@ 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'
--- a/modules/graphical/nixvim.nix
+++ b/modules/graphical/nixvim.nix
@ -161,8 +161,8 @@
        };
        servers = {
          bashls.enable = true;
-          lua_ls.enable = true;
-          nil_ls = {
+          lua-ls.enable = true;
+          nil-ls = {
            enable = true;
            settings.formatting.command = [ "nixfmt" "-w" "140" ];
          };
@ -175,8 +175,8 @@
              options.enable = true;
            };
          };
-          ruff_lsp.enable = true;
-          rust_analyzer = {
+          ruff-lsp.enable = true;
+          rust-analyzer = {
            enable = true;
            installRustc = true;
            installCargo = true;
@ -211,7 +211,6 @@
      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;
--- a/pkgs/build-worker-oci/default.nix
+++ b/pkgs/build-worker-oci/default.nix
@ -42,15 +42,9 @@ dockerTools.buildLayeredImage {
    mkdir -p /root/.ssh
    cat <<EOF > /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
-    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/RmFnel8pcZT9nh7EAfKfAekt3BoEXy0G7G2GTacN/ aprl@computer
-    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxsX+lEWkHZt9NOvn9yYFP0Z++186LY4b97C4mwj/f2 aprl@whatever
-    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpyVefbZLkNVNzdSIlO6x6JohHE1snoHiUB3Qdvl5I2 aprl@idk
-    ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVNo871p97NTefP52KYiwuch+FaVScxvcFd9fg0yykySTq7Y5JsxrJQgTnox/oDa0O87OyHD/GHQljAXkqiHpDkExbiGjDmGXJSKReKH061F4FqBnDIwYRzUu9Cxjl4MNqsU0RqLaz4+F42c/L7GROQwjEPUb8JHThRiI5FJnDvvB+oBLBxeyQA4v3O4i8DaDQayTr/XB+aSlhNwKrb6cjjL93AHT1uE53yY5jn4kZX+RiPQhH7rvt9N6E4Yr3CG6nUgRCUS0L66d9yfrq0XAbAVk9F+viV7Nk9qy4MWHtXZ4h0qUlzrGALPgGsCGiLGd4NvEgeCcV4nvxdmevxTSdKlJP75xlmlLVXGyhqCZkTsxm/png2UvDl+p0pLyrgNaNoXPdE0Jbv7C28WX36Nast1QFSMUhexzuOx8OgaOioeXVfK98AouqWb58iPBCvgreUIH/gJhZcnlB/Foo1KSO+fJNH8hAsLH7w0mnKyHhJjkrjjwUqsnpepB3SOLfZTE= aprl@meow
-    ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0v3tUBNEUxfoOQBFb+N2DUBQDay0iFggUWa9Nd+BtFLOKkz+RRto3eBF0ZiJZVUxv/hLb8m2s45hcMw8agwuPrXMe5085T1fzkvPdKAPZdsT/cCmBi1OsoLjAKBFIdM4lcV0A2cca8hip+/ZPpjFPUWx73/672gAPHU7co7fP8+8CSf9dx+WIeLx3yaYHYZ/th3dB5auX3VjOazS8MojsAorwTUeBoPamHQ5dFeNafhFUL/hhtGkUI1cNHUn3bJd2V7AKTW3UglK7hVgMJPrzVS31OlpcJEf6S5XgKTWdOSwubn1bs5Lt6YYRDU24NV6CGrwKgCJSRxzNMLwpnFKiSXpO8FzkqWHYWyju141hQcFF31aZIV+7YcwEt5ZukLjFOpVtpbSXvJYigOUzGi34P3/OAGshDXjTQjvM8GIir49gx3b2Nwhg0z4UHBkAKZvDDFPHDMJoclvnhITojaAojfC9zmMCO5ZaEsk8yv7c/lWQumzRpfldWF4mwHvhD5kTADbhRdO7WTdX7AaiAYINooToeWKjFe2wn3rFubPUppptqtP03mmvs7vhhgnEVBbGZRJK3GTVk1XcsfF9rDKzewSa+wb4LsBoZtFRhc8cJqHGlKWSNk7dQ04B1atPyNLKGpGoo/UIPxyZ6bSqFVxY3nhz46VZ6z8XWI48z0/fRQ== aprl@uwu
    EOF

    cat <<EOF > /root/.ssh/environment
--- 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:fd7a5c67d396fe6bddeb9c10779d97541ab3a1b2a9d744df3754a99add4046f1";
-  sha256 = "1ggkwd9zw8lj97ig7zah7dqy463hfhsgq3iwxxf8117gf8xi422s";
+  imageDigest = "sha256:338ca39c0c75f10919cd0cf38647ce4543033d2bbdabab4519de5adee45445f8";
+  sha256 = "0rzms97xnzlh63pjkqq3m5146lyw00mqgdldsd00c9bzk3ybr75x";
  finalImageName = "nixos/nix";
  finalImageTag = "latest";
 }