flake.lock: Update

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/5fd852c4155a689098095406500d0ae3d04654a8' (2024-11-14)
  → 'github:nix-community/disko/639d1520df9417ca2761536c3072688569e83c80' (2024-11-18)
• 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=bf04990c0962dea06423a91a1a023f07abe15bab' (2024-11-17)
• 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=6110422f7cfb3aac31c7c7552676dc4fe5ee775b' (2024-11-17)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10' (2024-11-14)
  → 'github:nix-community/home-manager/f3a2ff69586f3a54b461526e5702b1a2f81e740a' (2024-11-17)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12)
  → 'github:nixos/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6' (2024-11-16)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
  → 'github:nixos/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add' (2024-11-15)
• Updated input 'nixvim':
    'github:nix-community/nixvim/be455f7f2714ce3479ae5bb662a03bd450f45793' (2024-11-15)
  → 'github:nix-community/nixvim/5bc3fa6996ee37b754f2e815a165be6e4d0cfcb9' (2024-11-17)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/6c71c49e2448e51ad830ed211024e6d0edc50116' (2024-11-12)
  → 'github:lnl7/nix-darwin/f86f158efd4bab8dce3e207e4621f1df3a760b7a' (2024-11-15)
• Updated input 'nixvim/nuschtosSearch':
    'github:NuschtOS/search/135d202e032be70c93b6d7d53592ef4799d6efde' (2024-11-11)
  → 'github:NuschtOS/search/13300b2297c51368e0892c3ebe220f688014fe15' (2024-11-14)
• Updated input 'nixvim/nuschtosSearch/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4c91d52db103e757fc25b58998b0576ae702d659' (2024-11-11)
  → 'github:Mic92/sops-nix/472741cf3fee089241ac9ea705bb2b9e0bfa2978' (2024-11-17)
• Removed input 'sops-nix/nixpkgs-stable'
• Updated input 'stylix':
    'github:danth/stylix/5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f' (2024-11-15)
  → 'github:danth/stylix/9b61cc39b2c82f01b63bb0ae85865d7372697fc4' (2024-11-17)

config/hosts/crime/configuration.nix

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

config/profiles/rpi.nix

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

config/services/akkoma/default.nix

@@ -13,79 +13,34 @@
 
   services.akkoma = {
     enable = true;
-    extraPackages = let
+    extraPackages = with pkgs; [ exiftool ffmpeg-headless imagemagick ];
-      imagemagick = pkgs.imagemagick.override {
+    extraStatic."emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
-        libheif = pkgs.libheif.overrideAttrs (prevAttrs: {
-          buildInputs = prevAttrs.buildInputs or [ ] ++ [ pkgs.svt-av1 ];
-          cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [ "-DWITH_SvtEnc=ON" ];
-        });
-      };
-    in with pkgs; [ exiftool ffmpeg-headless imagemagick ];
 
-    extraStatic = let
+    extraStatic."emoji/florp" = pkgs.runCommandNoCC "florp" {
-      actualFetchzip =
+      src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
-      {
+    } ''
-        url,
+      mkdir $out
-        hash
+      cp $src $out/florp.png
-      }: pkgs.runCommandNoCC "${lib.last (lib.splitString "/" url)}" {
+    '';
-        src = pkgs.fetchurl {
-          inherit url hash;
-        };
-      } ''
-        ${lib.getExe pkgs.unzip} $src -d $out
-        for f in $out/*_256.png; do
-          mv -- "$f" "''${f/_256}"
-        done
-      '';
-    in {
-      "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
 
-      "emoji/custom" = pkgs.runCommandNoCC "florp" {
+    extraStatic."static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
-        src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
+      builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
-      } ''
+        elly-mod = "/static/themes/elly-mod.json";
-        mkdir $out
+      }
-        cp $src $out/florp.png
+    ));
-      '';
 
-      "emoji/neodog" = actualFetchzip {
+    extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
-        url = "https://git.gay/moonrabbits/neodog/raw/commit/6f9eb283b6dcbe507fde1110abab267cb2d73b70/neodog.zip";
-        hash = "sha256-ISyzpRyjHf+4jKrOtHHqH0Qn7CQu5RQSLH/HL/YSdT4=";
-      };
 
-      "emoji/neocat" = actualFetchzip {
+    extraStatic."static/custom.css" = pkgs.writeText "custom.css" ''
-        url = "https://volpeon.ink/emojis/neocat/neocat.zip";
+      .tos-content img, .terms-of-service img { 
-        hash = "sha256-DZDuk0Djlax504flNWdpqAw+ROLOOVGj0ZvJLyouo7A=";
+        max-width: 100%;
-      };
+      }
+    '';
 
-      "emoji/neofox" = actualFetchzip {
+    extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
-        url = "https://volpeon.ink/emojis/neofox/neofox.zip";
+    extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
-        hash = "sha256-rZUPA7ZvrO8q/lx8XK3IxJ1URLgq0PSh752eWzG+uos=";
+    extraStatic."images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
-      };
+    extraStatic."favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
-
-      "emoji/blobhaj" = actualFetchzip {
-        url = "https://web.archive.org/web/20240829143703/https://heatherhorns.com/wp-content/uploads/2022/12/Blobhaj-12-13-2022.zip";
-        hash = "sha256-5l8ozTivCSOomPq+zDD4FWhK5mA/H2qkGs8beuDnp9s=";
-      };
-
-      "static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
-        builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
-          elly-mod = "/static/themes/elly-mod.json";
-        }
-      ));
-
-      "static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
-
-      "static/custom.css" = pkgs.writeText "custom.css" ''
-        .tos-content img, .terms-of-service img {
-          max-width: 100%;
-        }
-      '';
-
-      "static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
-      "images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
-      "images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
-      "favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
-    };
 
     frontends = {
       primary = {
@@ -155,21 +110,6 @@
         ];
       };
 
-      ":emoji".groups = {
-        blobs = "/emoji/blobs.gg/*.png";
-        blobhaj = "/emoji/blobhaj/512w/*.png";
-        neodog = "/emoji/neodog/*.png";
-        neocat = [
-          "/emoji/neocat/*.png"
-          "/emoji/neodog/additional_neocat/*.png"
-        ];
-        neofox = [
-          "/emoji/neofox/*.png"
-          "/emoji/neodog/additional_neofox/*.png"
-        ];
-        Custom = "/emoji/custom/*.png";
-      };
-
       "Pleroma.Captcha".method = mkRaw "Pleroma.Captcha.Kocaptcha";
 
       "Pleroma.Web.Endpoint".url.host = "florp.social";

config/services/arrs/default.nix

@@ -1,11 +1,8 @@
 { lib, pkgs, ... }: {
 
-  services = lib.genAttrs [
+  services = {
-    "sonarr"
+    prowlarr.enable = true;
-    "radarr"
+  } // lib.genAttrs [ "sonarr" "radarr" ] (_: {
-    "prowlarr"
-    "lidarr"
-  ] (_: {
     enable = true;
   });
   systemd.services = lib.genAttrs [ "radarr" "sonarr" ] (_: {
@@ -39,10 +36,6 @@
       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;

config/services/arrs/landingPage.html

@@ -19,8 +19,6 @@ 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>
 

config/services/hydra/default.nix

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

config/services/hydra/nix-config.nix

@@ -25,11 +25,20 @@
       maxJobs = 0;
       speedFactor = 20;
       systems = [ "riscv64-linux" ];
-      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
+      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
-  ] ++ lib.forEach (lib.range 0 11) (num: {
+    {
-      hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
+      hostName = "machine-0008.cloud-v.co";
+      sshUser = "root";
+      maxJobs = 2;
+      speedFactor = 4;
+      systems = [ "riscv64-linux" ];
+      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
+      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}";
       sshUser = "root";
       maxJobs = 2;
       speedFactor = 20;
@@ -54,9 +63,9 @@
       "build-worker-04.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOq+5I+nlAN2lJoOtoXrYEDuZ/TMPMa43pIlablYigK";
       "integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU";
       "schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
+      "[machine.cloud-v.co]:20008".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6Kri0cjPKEXXDEl2GwfwzPO9wuPZEgJS0M6lKRHCqH";
       "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";
@@ -65,18 +74,15 @@
       "[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.forEach (lib.range 0 11) (num: ''
+    '' + lib.concatLines (lib.genList (i: ''
-      Host build-worker-${lib.fixedWidthNumber 2 num}
+      Host build-worker-0${toString (i + 1)}
-        Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
+        Hostname build-worker-kyoumanet.fly.dev
-        Port 22${lib.fixedWidthNumber 2 num}
+        Port 220${toString (i + 1)}
-    ''));
+    '') 8);
   };
 }

config/users/emily/default.nix

@@ -37,9 +37,7 @@
       pavucontrol
       signal-desktop
       element-desktop
-      firefox
+      inputs.firefox.packages.${pkgs.system}.firefox
-      # currently broken
-      #inputs.firefox.packages.${pkgs.system}.firefox
       
       nixfmt-classic
       wl-clipboard

config/users/lucy/default.nix

@@ -9,8 +9,8 @@
     ignoreShellProgramCheck = true;
     extraGroups = [ "wheel" ];
     openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCujVaJCx/MXp/6ss9eSH+UmWQXGHWMxzYATQPBoWX1hNHlxjqbXjmbvv/cJD+PDPrEDtzlI+0uMknPItNZ6G28BcWpU18AJqrIaPBKxEtNj7RiImDG2VUKunKEEiBR33IH709ajpy2W6WBEN3GddGclxC7V2FFGWVeXzU9QBaJPL1AuVq4rOOC01XTI3vXYfaFFqlatMckq9fjXaQuwdUblcBwepFyJ626hJ53/UnIWV5BFpfqCOVxaF38L1rBN++VZatak7hD2Wa+SDeUnymWyhapNhpCD2OiiBaBy6oT88jhhucH0iA9VQfzepPxNnxe2CGJ4IE1MQdnPXKlDeSEGjeNQmiEtwq0zv9mPRLJYmgZrxZau+1ZjqQrx7DzzVdmHrLzOH9JmKJmKSD1V98ASqHbCMvDEUZ6x2CS1hS9zNf8J4Mwzdsv3P/CTDH9Yv1ipiz4qafQZ8KCbYyf1wMeHckm60QpW3tBn3cD/MEv4hqS8FMW+9rrh5+kmKgQDBM= emilia@emilia"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIId7XvwEHtC9KdGg4Bn+XE+yyBp7/dRToJX9T56mM7ln kosaki@kosaki"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZH8HwE1OxVAArRpc3+c7foYJ/WYjp4BqUyuab9yQyl emilia@emilia"
     ];
   };
 
@@ -30,34 +30,6 @@
     programs.gpg.enable = true;
     programs.ripgrep.enable = true;
 
-    programs.tmux = {
-      enable = true;
-      prefix = "M-w";
-      clock24 = true;
-      extraConfig = ''
-        # unbind keys
-        unbind-key C-b
-
-        # new prefix
-        bind-key M-w send-prefix
-
-        # selection via vim keys
-        bind-key -r	h select-pane -L
-        bind-key -r	j select-pane -D
-        bind-key -r	k select-pane -U
-        bind-key -r	l select-pane -R
-
-        # resize aswell
-        bind-key -r	C-h resize-pane -L 5
-        bind-key -r	C-j resize-pane -D 5
-        bind-key -r	C-k resize-pane -U 5
-        bind-key -r	C-l resize-pane -R 5
-
-        bind-key	g split-window
-        bind-key	v split-window -h
-      '';
-    };
-
     programs.eza = {
       enable = true;
       icons = "auto";

flake.lock

@@ -30,11 +30,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1732200724,
+        "lastModified": 1708890466,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
+        "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
+        "rev": "665b3c6748534eb766c777298721cece9453fdae",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     "base16-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1731949548,
+        "lastModified": 1716150083,
-        "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
+        "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
         "owner": "tinted-theming",
         "repo": "base16-vim",
-        "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
+        "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732742778,
+        "lastModified": 1731895210,
-        "narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
+        "narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
+        "rev": "639d1520df9417ca2761536c3072688569e83c80",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732728458,
+        "lastModified": 1731882255,
-        "narHash": "sha256-UpSmqS5aX+UfQ94TDsqv5KDoJnpGT1CbgnzY/Egfc50=",
+        "narHash": "sha256-qyGHBMpYLaBPUXzrqIvcDL8fREzp+683iNHoo2gyh9M=",
         "ref": "refs/heads/main",
-        "rev": "0ab60773023ac5c303b402e8a8c84708ea5c59bc",
+        "rev": "bf04990c0962dea06423a91a1a023f07abe15bab",
-        "revCount": 4,
+        "revCount": 3,
         "type": "git",
         "url": "https://woof.rip/mikael/firefox.git"
       },
@@ -284,11 +284,11 @@
     "flake-compat_4": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1673956053,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
         "type": "github"
       },
       "original": {
@@ -366,11 +366,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1726560853,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -402,11 +402,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1726560853,
+        "lastModified": 1710146030,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -441,11 +441,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1710146030,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -531,11 +531,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732211216,
+        "lastModified": 1731611636,
-        "narHash": "sha256-eXsk0hZ2sFAvQht9W6Xxej/8AHYCGzvATFLoY1xwG/o=",
+        "narHash": "sha256-Do8vpR8JTpkPr9vxf1aRzhb4/cUBjg5twPyGDyezxJw=",
         "ref": "refs/heads/main",
-        "rev": "81f0a4377c1218d328e7996636a02faf0597efa0",
+        "rev": "32e1061cb2ef3cd0eab0bd99f062a2776a73d459",
-        "revCount": 9,
+        "revCount": 7,
         "type": "git",
         "url": "https://woof.rip/florp/moderation.git"
       },
@@ -547,11 +547,11 @@
     "fromYaml": {
       "flake": false,
       "locked": {
-        "lastModified": 1731966426,
+        "lastModified": 1689549921,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
         "owner": "SenchoPens",
         "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
         "type": "github"
       },
       "original": {
@@ -577,11 +577,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732021966,
+        "lastModified": 1731363552,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
         "type": "github"
       },
       "original": {
@@ -636,11 +636,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482255,
+        "lastModified": 1731887066,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
         "type": "github"
       },
       "original": {
@@ -727,11 +727,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1732112222,
+        "lastModified": 1731683711,
-        "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
+        "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
-        "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
+        "rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d"
       },
       "original": {
         "type": "tarball",
@@ -754,11 +754,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732603698,
+        "lastModified": 1731185731,
-        "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
+        "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
-        "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
+        "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
       },
       "original": {
         "type": "tarball",
@@ -775,15 +775,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1729360442,
+        "lastModified": 1723510904,
-        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
+        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
-        "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
+        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
       }
     },
     "lix_2": {
@@ -795,29 +795,29 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1729298361,
+        "lastModified": 1723503926,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
       }
     },
     "lix_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1729298361,
+        "lastModified": 1723503926,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
       }
     },
     "neoidiosyn": {
@@ -830,10 +830,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1732728441,
+        "lastModified": 1731882236,
-        "narHash": "sha256-jaocsiOHZRTjXLBr6RZanVnB/P2tVLtUiA/QR45HBKU=",
+        "narHash": "sha256-kZxwlk3NA4HeipGXi6sNsDMvg5qXZBTsfNnGdBWKqyk=",
         "ref": "refs/heads/main",
-        "rev": "6028166f27a98fe92913b1923b6e07b35c0c40d0",
+        "rev": "6110422f7cfb3aac31c7c7552676dc4fe5ee775b",
         "revCount": 1,
         "type": "git",
         "url": "https://woof.rip/mikael/neoidiosyn.git"
@@ -851,11 +851,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732603785,
+        "lastModified": 1731642829,
-        "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
+        "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
+        "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
         "type": "github"
       },
       "original": {
@@ -953,11 +953,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732483221,
+        "lastModified": 1731797098,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
         "type": "github"
       },
       "original": {
@@ -1068,11 +1068,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1732521221,
+        "lastModified": 1731676054,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {
@@ -1099,11 +1099,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1732726573,
+        "lastModified": 1731883908,
-        "narHash": "sha256-gvCPgtcXGf/GZaJBHYrXuM5r2pFRG3VDr7uOb7B1748=",
+        "narHash": "sha256-Yt/eVhoj+SwpsQVK0YxM8jou55ni0+dqANuQ2IvIA28=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "fc9178d124eba824f1862513314d351784e1a84c",
+        "rev": "5bc3fa6996ee37b754f2e815a165be6e4d0cfcb9",
         "type": "github"
       },
       "original": {
@@ -1122,11 +1122,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731936508,
+        "lastModified": 1731582522,
-        "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
+        "narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
+        "rev": "13300b2297c51368e0892c3ebe220f688014fe15",
         "type": "github"
       },
       "original": {
@@ -1135,29 +1135,6 @@
         "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": {
@@ -1194,7 +1171,6 @@
         "nixos-needsreboot": "nixos-needsreboot",
         "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
-        "oth": "oth",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
       }
@@ -1206,11 +1182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732575825,
+        "lastModified": 1731862312,
-        "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
+        "narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
+        "rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978",
         "type": "github"
       },
       "original": {
@@ -1240,11 +1216,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1732608183,
+        "lastModified": 1731861652,
-        "narHash": "sha256-T5k5ill+PNIEW6KuS4CpUacMtZNJe2J2q5eBOF4xWuU=",
+        "narHash": "sha256-71iRk7zLR+r9urKPEoutLqPm3Tex6gLbZyWPI4VoHIs=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "7689e621f87bce7b6ab1925dfd70ad1f4c80f334",
+        "rev": "9b61cc39b2c82f01b63bb0ae85865d7372697fc4",
         "type": "github"
       },
       "original": {
@@ -1365,11 +1341,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1729501581,
+        "lastModified": 1696725902,
-        "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
+        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
+        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
         "type": "github"
       },
       "original": {
@@ -1408,11 +1384,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732643199,
+        "lastModified": 1730321837,
-        "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=",
+        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c",
+        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -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.1.tar.gz";
+    lix.url = "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz";
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-needsreboot = {
@@ -64,11 +64,6 @@
       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";

fly.toml

@@ -5,7 +5,6 @@ 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'
@@ -15,34 +14,28 @@ 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 = '256GB'
+  initial_size = '128GB'
   processes = ['bw-01']
 
 [[mounts]]
   source = 'bw02'
   destination = '/mnt/data'
-  initial_size = '256GB'
+  initial_size = '128GB'
   processes = ['bw-02']
 
 [[mounts]]
   source = 'bw03'
   destination = '/mnt/data'
-  initial_size = '256GB'
+  initial_size = '128GB'
   processes = ['bw-03']
 
 [[mounts]]
   source = 'bw04'
   destination = '/mnt/data'
-  initial_size = '256GB'
+  initial_size = '128GB'
   processes = ['bw-04']
 
 [[mounts]]
@@ -69,15 +62,6 @@ 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

modules/graphical/hyprland.nix

@@ -8,9 +8,7 @@
         playerctl = "${pkgs.playerctl}/bin/playerctl";
         notifysend = "${pkgs.libnotify}/bin/notify-send";
         dolphin = "${pkgs.libsForQt5.dolphin}/bin/dolphin";
-        firefox = "${pkgs.firefox}/bin/firefox";
+        firefox = "${inputs.firefox.packages.${pkgs.system}.firefox}/bin/firefox";
-        # currently broken
-        #firefox = "${inputs.firefox.packages.${pkgs.system}.firefox}/bin/firefox";
         brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
         screenshot = "~/.local/bin/hypr/screenshot.sh";
         rofi = "${pkgs.rofi-wayland}/bin/rofi";

pkgs/build-worker-oci/cdg/fly.toml

@@ -1,67 +0,0 @@
-# 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'

pkgs/build-worker-oci/default.nix

@@ -51,9 +51,6 @@ dockerTools.buildLayeredImage {
     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
-    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAAl3/krXJeCcDEJXRuzOdCOrJLG7b6MRqC+a9Xux3mW vika@hydrangea
-    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQjTy9qqHcs5vgTz+iMAiNNMqdyGtOhEpnpJCReEFfZ vika@rafflesia
-    sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINAgFdk78I4zssUGsAIV01zefLBpwc1W7hfTobbG80XLAAAABHNzaDo= vika@nitrokey
     EOF
 
     cat <<EOF > /root/.ssh/environment

pkgs/build-worker-oci/source.nix

@@ -4,8 +4,8 @@
 
 dockerTools.pullImage {
   imageName = "nixos/nix";
-  imageDigest = "sha256:133a1607deea14a02c2bc0850e275ed135814235a1147f68967afee261caea2b";
+  imageDigest = "sha256:fd7a5c67d396fe6bddeb9c10779d97541ab3a1b2a9d744df3754a99add4046f1";
-  sha256 = "0602a59g14l1jiqfffz14hcp982qaqczi5f0ylvv0h9pp2pqrqs5";
+  sha256 = "1ggkwd9zw8lj97ig7zah7dqy463hfhsgq3iwxxf8117gf8xi422s";
   finalImageName = "nixos/nix";
   finalImageTag = "latest";
 }

pkgs/update-nixfiles/update-nixfiles.sh

@@ -23,9 +23,7 @@ merge_theirs () {
 test_build () {
   local build_jobs
 
-  sleep 30
+  build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")"
-
-  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