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)

config/hosts/crime/configuration.nix

@@ -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"
     ];
   };
 }

config/profiles/rpi.nix

@@ -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;
 

config/services/akkoma/default.nix

@@ -13,34 +13,79 @@
 
   services.akkoma = {
     enable = true;
-    extraPackages = with pkgs; [ exiftool ffmpeg-headless imagemagick ];
-    extraStatic."emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
+    extraPackages = let
+      imagemagick = pkgs.imagemagick.override {
+        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."emoji/florp" = pkgs.runCommandNoCC "florp" {
-      src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
-    } ''
-      mkdir $out
-      cp $src $out/florp.png
-    '';
+    extraStatic = let
+      actualFetchzip =
+      {
+        url,
+        hash
+      }: 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;
 
-    extraStatic."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";
-      }
-    ));
+      "emoji/custom" = pkgs.runCommandNoCC "florp" {
+        src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
+      } ''
+        mkdir $out
+        cp $src $out/florp.png
+      '';
 
-    extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
+      "emoji/neodog" = actualFetchzip {
+        url = "https://git.gay/moonrabbits/neodog/raw/commit/6f9eb283b6dcbe507fde1110abab267cb2d73b70/neodog.zip";
+        hash = "sha256-ISyzpRyjHf+4jKrOtHHqH0Qn7CQu5RQSLH/HL/YSdT4=";
+      };
 
-    extraStatic."static/custom.css" = pkgs.writeText "custom.css" ''
-      .tos-content img, .terms-of-service img { 
-        max-width: 100%;
-      }
-    '';
+      "emoji/neocat" = actualFetchzip {
+        url = "https://volpeon.ink/emojis/neocat/neocat.zip";
+        hash = "sha256-DZDuk0Djlax504flNWdpqAw+ROLOOVGj0ZvJLyouo7A=";
+      };
 
-    extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
-    extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
-    extraStatic."images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
-    extraStatic."favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
+      "emoji/neofox" = actualFetchzip {
+        url = "https://volpeon.ink/emojis/neofox/neofox.zip";
+        hash = "sha256-rZUPA7ZvrO8q/lx8XK3IxJ1URLgq0PSh752eWzG+uos=";
+      };
+
+      "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 = {
@@ -110,6 +155,21 @@
         ];
       };
 
+      ":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/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 = 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";

config/services/hydra/nix-config.nix

@@ -28,8 +28,8 @@
       supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
       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;
@@ -56,6 +56,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 +65,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}
+    ''));
   };
 }

config/users/emily/default.nix

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

flake.lock

@@ -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": {
@@ -156,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731895210,
-        "narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=",
+        "lastModified": 1732482708,
+        "narHash": "sha256-B1MQLiWi4bbeNiRXKxEkpztnKyWae4x0LyK32v3DjLk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "639d1520df9417ca2761536c3072688569e83c80",
+        "rev": "47bc8dfb6f48d5f66a3cb3a4cece83d8ace1f61a",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731970906,
-        "narHash": "sha256-nE9QShMKAKTKtDUauTjNFs9TJ92IVocDJXBhqPWkdCo=",
+        "lastModified": 1732481910,
+        "narHash": "sha256-XXBdhGvx22lVDgIzzIHowBMGK7Z1jmmcZ6N22+ufu4A=",
         "ref": "refs/heads/main",
-        "rev": "f36a4ac2b4bd6845e701bdfafc84058652d69faf",
-        "revCount": 3,
+        "rev": "22fff6832b2828006061d5c8f781ca052f55bdb2",
+        "revCount": 4,
         "type": "git",
         "url": "https://woof.rip/mikael/firefox.git"
       },
@@ -366,11 +366,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 +402,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": {
@@ -531,11 +531,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 +547,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 +577,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 +636,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731968878,
-        "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=",
+        "lastModified": 1732482255,
+        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a42fa14b53ceab66274a21da480c9f8e06204173",
+        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
         "type": "github"
       },
       "original": {
@@ -727,11 +727,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1731683711,
-        "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
-        "rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
+        "lastModified": 1732112222,
+        "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
+        "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
         "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/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff"
       },
       "original": {
         "type": "tarball",
@@ -754,11 +754,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731185731,
-        "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
-        "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
+        "lastModified": 1731967274,
+        "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
+        "rev": "aa2846680fa9a2032939d720487942567fd9eb63",
         "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/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
       },
       "original": {
         "type": "tarball",
@@ -775,15 +775,15 @@
         ]
       },
       "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": {
@@ -795,29 +795,29 @@
         "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"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
       }
     },
     "neoidiosyn": {
@@ -830,10 +830,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1731970829,
-        "narHash": "sha256-Nj64byF1YDQOWcea8m0ifSJZW8rJvF26sB01Acn+Ef4=",
+        "lastModified": 1732481879,
+        "narHash": "sha256-Tj9yPVOA2JlAAFhynX9MRkwOd8VYeilkoesn8zzQr2E=",
         "ref": "refs/heads/main",
-        "rev": "3fd142ca84ae4c08927402f4aa677a098851504e",
+        "rev": "b7171c109da4f52bf59ad5159ec13ee9246ec28d",
         "revCount": 1,
         "type": "git",
         "url": "https://woof.rip/mikael/neoidiosyn.git"
@@ -851,11 +851,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731885500,
-        "narHash": "sha256-ZrztYfSOS33J+ewq5alBOSdnIyZ0/sr1iy7FyBe9zIg=",
+        "lastModified": 1732324260,
+        "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5",
+        "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a",
         "type": "github"
       },
       "original": {
@@ -953,11 +953,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1731797098,
-        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
+        "lastModified": 1732483221,
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
         "type": "github"
       },
       "original": {
@@ -1068,11 +1068,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1731676054,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
         "type": "github"
       },
       "original": {
@@ -1099,11 +1099,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1731969202,
-        "narHash": "sha256-k10MJfCQXUUzkvAQMs8b8UsCjIQQPNWEPMlBrHOoPqU=",
+        "lastModified": 1732478249,
+        "narHash": "sha256-ka41KXN5B5C6yxJeIpFw5ytXFjd6vXJldw/5sN6y0CA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2017830a2c81a97f6b7679ea5fa0d921cd0f4535",
+        "rev": "a81a03a3f5dcdcdee5cbe831a9f2e81895e92875",
         "type": "github"
       },
       "original": {
@@ -1135,6 +1135,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": {
@@ -1171,6 +1194,7 @@
         "nixos-needsreboot": "nixos-needsreboot",
         "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
+        "oth": "oth",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
       }
@@ -1182,11 +1206,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731954233,
-        "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
+        "lastModified": 1732186149,
+        "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
+        "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
         "type": "github"
       },
       "original": {
@@ -1216,11 +1240,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1731920923,
-        "narHash": "sha256-Pqe38TdvfyywhlhpR1WLJlD7uTOGXRRuzpHIh2edOz0=",
+        "lastModified": 1732261424,
+        "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "f8699483e46972f64b0dee5d5e41bf4bb142629b",
+        "rev": "b667a340730dd3d0596083aa7c949eef01367c62",
         "type": "github"
       },
       "original": {
@@ -1384,11 +1408,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731944360,
-        "narHash": "sha256-sJxPh+V0vUkBhlA58ok/y0o96AtfqiEF0O8qsdolI6o=",
+        "lastModified": 1732292307,
+        "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "579b9a2fd0020cd9cd81a4ef4eab2dca4d20c94c",
+        "rev": "705df92694af7093dfbb27109ce16d828a79155f",
         "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.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";

modules/graphical/hyprland.nix

@@ -8,7 +8,9 @@
         playerctl = "${pkgs.playerctl}/bin/playerctl";
         notifysend = "${pkgs.libnotify}/bin/notify-send";
         dolphin = "${pkgs.libsForQt5.dolphin}/bin/dolphin";
-        firefox = "${inputs.firefox.packages.${pkgs.system}.firefox}/bin/firefox";
+        firefox = "${pkgs.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/ams/fly.toml

@@ -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

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

@@ -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'

pkgs/update-nixfiles/update-nixfiles.sh

@@ -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