flake.lock: Update

Flake lock file updates:

• Updated input 'attic':
    'github:zhaofengli/attic/48c8b395bfbc6b76c7eae74df6c74351255a095c' (2024-10-30)
  → 'github:zhaofengli/attic/d0b66cf897e4d55f03d341562c9821dc4e566e54' (2024-11-06)
• Updated input 'disko':
    'github:nix-community/disko/380847d94ff0fedee8b50ee4baddb162c06678df' (2024-11-03)
  → 'github:nix-community/disko/856a2902156ba304efebd4c1096dbf7465569454' (2024-11-04)
• Updated input 'home-manager':
    'github:nix-community/home-manager/8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661' (2024-11-03)
  → 'github:nix-community/home-manager/2f607e07f3ac7e53541120536708e824acccfaa8' (2024-11-05)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/f6e0cd5c47d150c4718199084e5764f968f1b560' (2024-11-02)
  → 'github:nixos/nixos-hardware/e1cc1f6483393634aee94514186d21a4871e78d7' (2024-11-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02)
  → 'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)
• Updated input 'nixvim':
    'github:nix-community/nixvim/6f210158b03b01a1fd44bf3968165e6da80635ce' (2024-11-02)
  → 'github:nix-community/nixvim/898246c943ba545a79d585093e97476ceb31f872' (2024-11-06)
• Updated input 'nixvim/git-hooks':
    'github:cachix/git-hooks.nix/af8a16fe5c264f5e9e18bcee2859b40a656876cf' (2024-10-30)
  → 'github:cachix/git-hooks.nix/d70155fdc00df4628446352fc58adc640cd705c2' (2024-11-05)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/683d0c4cd1102dcccfa3f835565378c7f3cbe05e' (2024-11-01)
  → 'github:lnl7/nix-darwin/0e3f3f017c14467085f15d42343a3aaaacd89bcb' (2024-11-05)
• Updated input 'nixvim/nuschtosSearch':
    'github:NuschtOS/search/9e22bd742480916ff5d0ab20ca2522eaa3fa061e' (2024-11-02)
  → 'github:NuschtOS/search/aa5214c81b904a19f7a54f7a8f288f7902586eee' (2024-11-04)
• Updated input 'nixvim/nuschtosSearch/ixx':
    'github:NuschtOS/ixx/65c207c92befec93e22086da9456d3906a4e999c' (2024-10-21)
  → 'github:NuschtOS/ixx/9fd01aad037f345350eab2cd45e1946cc66da4eb' (2024-10-26)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/e9b5eef9b51cdf966c76143e13a9476725b2f760' (2024-11-03)
  → 'github:Mic92/sops-nix/c5ae1e214ff935f2d3593187a131becb289ea639' (2024-11-06)
• Updated input 'stylix':
    'github:danth/stylix/04afcfc0684d9bbb24bb1dc77afda7c1843ec93b' (2024-10-26)
  → 'github:danth/stylix/762c07ee10b381bc8e085be5b6c2ec43139f13b0' (2024-11-06)

.sops.yaml

@@ -3,6 +3,7 @@ keys:
   - &seras age1ht2wetcyl9rzu45e02pqqwgmyfsfe6y6ygxyuxpfhnkdm62d3pqsg3uqvd
   - &emilia age1pjn7q6qs49jenr40dhsxa8x5g4z6elsh0pk0tc5pxg6pl0nzgc6scakynn
   - &girldick age1r6cmthdk6lhy62wa4pu23l46f5fcqhuu7xrq353pe6c8f0s6ce8s67pdtf
+  - &florp age18vc8rcmczlt3r0ee7jr9s8l3yrkthu8wtypt08eh0eskpkw3dg6qxs7t3t
 creation_rules:
   - path_regex: secrets/services/dns-knot.yaml
     key_groups:
@@ -57,4 +58,4 @@ creation_rules:
     - pgp:
       - *emily
       age:
-      - *seras
+      - *florp

config/common/default.nix

@@ -1,6 +1,6 @@
-{ config, inputs, lib, pkgs, ... }: 
-
-with lib; {
+{ config, inputs, lib, pkgs, ... }: let 
+  inherit (lib) mkDefault;
+in {
   imports = [
     ./kernel.nix
     ./networking.nix
@@ -105,6 +105,6 @@ with lib; {
 
   services.fprintd.enable = config.kyouma.machine-type.graphical;
 
-  system.stateVersion = "23.11";
+  system.stateVersion = mkDefault "23.11";
   time.timeZone = mkDefault "CET";
 }

config/hosts/crime/configuration.nix

@@ -7,11 +7,7 @@
     ../../services/nginx.nix
     ./nginx.nix
   ];
-  networking = {
-    hostName = "crime";
-    firewall.allowedTCPPorts = [ 80 443 ];
-    firewall.allowedUDPPorts = [ 443 ];
-  };
+  networking.hostName = "crime";
   systemd.network.networks."98-eth-default" = {
     address = [
       "2a0f:be01:0:100::1337/128"

config/hosts/emilia/configuration.nix

@@ -17,10 +17,8 @@
   kyouma.machine-type.physical = true;
   kyouma.nginx.defaultForbidden = "uptime.kyouma.net";
 
-  networking = {
-    firewall.allowedTCPPorts = [ 80 443 ];
-    hostName = "emilia";
-  };
+  networking.hostName = "emilia";
+
   systemd.network.networks."98-eth-default" = {
     matchConfig.MACAddress = "04:d4:c4:39:73:f6";
     addresses = [

config/hosts/florp/configuration.nix

@@ -0,0 +1,41 @@
+{ lib, ... }: {
+  imports = [
+    ../../common
+    ../../profiles/headless.nix
+    ../../profiles/kartoffel.nix
+    ../../profiles/lxc.nix
+    ../../services/akkoma
+    ../../services/nginx.nix
+  ];
+  networking = {
+    hostName = "florp";
+    domain = lib.mkForce "social";
+  };
+  kyouma.nginx.defaultForbidden = "florp.social";
+  systemd.network.networks."98-eth-default" = {
+    address = [
+      "2a0f:be01:0:100::171/128" 
+    ];
+  };
+
+  services.postgresql.settings = {
+    max_connections = 30;
+    shared_buffers = "4GB";
+    effective_cache_size = "12GB";
+    maintenance_work_mem = "1GB";
+    checkpoint_completion_target = 0.9;
+    wal_buffers = "16MB";
+    default_statistics_target = 100;
+    random_page_cost = 1.1;
+    effective_io_concurrency = 200;
+    work_mem = "34952kB";
+    huge_pages = "try";
+    min_wal_size = "2GB";
+    max_wal_size = "8GB";
+    max_worker_processes = 16;
+    max_parallel_workers_per_gather = 4;
+    max_parallel_workers = 16;
+    max_parallel_maintenance_workers = 4;
+  };
+  system.stateVersion = "24.11";
+}

config/hosts/girldick/configuration.nix

@@ -11,7 +11,6 @@
     domain = lib.mkForce "girldick.gay";
     hostName = "staging";
     nftables.enable = lib.mkForce false;
-    firewall.allowedTCPPorts = [ 80 443 ];
   };
   systemd.network.networks."98-eth-default" = {
     address = [

config/hosts/seras/configuration.nix

@@ -5,17 +5,13 @@
     ../../profiles/headless.nix
     ../../profiles/kartoffel.nix
     ../../profiles/lxc.nix
-    ../../services/akkoma
     ../../services/nginx.nix
     ../../services/hydra
     ../../services/update-nixfiles.nix
   ];
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
-  networking = {
-    hostName = "seras";
-    firewall.allowedTCPPorts = [ 80 443 ];
-  };
+  networking.hostName = "seras";
   systemd.network.networks."98-eth-default" = {
     address = [
       "2a0f:be01:0:100::169/128" 

config/hosts/web-dus/configuration.nix

@@ -11,8 +11,7 @@
   networking = {
     hostName = "web-dus";
     nftables.enable = lib.mkForce false;
-    firewall.allowedTCPPorts = [ 80 443 11019 ];
-    firewall.allowedUDPPorts = [ 443 ];
+    firewall.allowedTCPPorts = [ 11019 ];
   };
   systemd.network.networks."98-eth-default" = {
     address = [

config/services/akkoma/default.nix

@@ -1,34 +1,21 @@
-{ config, inputs, pkgs, ... }: {
-  sops.secrets."services/akkoma/mailerPassword" = {
+{ config, inputs, lib, pkgs, ... }: {
+ sops.secrets."services/akkoma/mailerPassword" = {
     sopsFile = ../../../secrets/services/akkoma.yaml;
   };
   sops.secrets."services/akkoma/deepl" = {
     sopsFile = ../../../secrets/services/akkoma.yaml;
   };
+
   services.akkoma = {
     enable = true;
     extraPackages = with pkgs; [ exiftool ffmpeg-headless imagemagick ];
     extraStatic."emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
 
-    extraStatic."static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON {
-      pleroma-dark = "/static/themes/pleroma-dark.json";
-      pleroma-light = "/static/themes/pleroma-light.json";
-      pleroma-amoled = [ "Pleroma Dark AMOLED" "#000000" "#111111" "#b0b0b1" "#d8a070" "#aa0000" "#0fa00f" "#0095ff" "#d59500"];
-      classic-dark = [ "Classic Dark" "#161c20" "#282e32" "#b9b9b9" "#baaa9c" "#d31014" "#0fa00f" "#0095ff" "#ffa500" ];
-      bird = [ "Bird" "#f8fafd" "#e6ecf0" "#14171a" "#0084b8" "#e0245e" "#17bf63" "#1b95e0" "#fab81e"];
-      ir-black = [ "Ir Black" "#000000" "#242422" "#b5b3aa" "#ff6c60" "#FF6C60" "#A8FF60" "#96CBFE" "#FFFFB6" ];
-      monokai = [ "Monokai" "#272822" "#383830" "#f8f8f2" "#f92672" "#F92672" "#a6e22e" "#66d9ef" "#f4bf75" ];
-
-      redmond-xx = "/static/themes/redmond-xx.json";
-      redmond-xx-se = "/static/themes/redmond-xx-se.json";
-      redmond-xxi = "/static/themes/redmond-xxi.json";
-      breezy-dark = "/static/themes/breezy-dark.json";
-      breezy-light = "/static/themes/breezy-light.json";
-      paper = "/static/themes/paper.json";
-      thekanata = "/static/themes/thekanata.json";
-      ihatebeingalive = "/static/themes/ihatebeingalive.json";
-      elly-mod = "/static/themes/elly-mod.json";
-    });
+    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";
+      }
+    ));
 
     extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
 
@@ -38,23 +25,7 @@
 
     extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.wallpaper;
 
-    extraStatic."favicon.png" = let
-      rev = "697a8211b0f427a921e7935a35d14bb3e32d0a2c";
-    in pkgs.stdenvNoCC.mkDerivation {
-      name = "favicon.png";
-
-      src = pkgs.fetchurl {
-        url = "https://raw.githubusercontent.com/TilCreator/NixOwO/${rev}/NixOwO_plain.svg";
-        hash = "sha256-tWhHMfJ3Od58N9H5yOKPMfM56hYWSOnr/TGCBi8bo9E=";
-      };
-
-      nativeBuildInputs = with pkgs; [ librsvg ];
-
-      dontUnpack = true;
-      installPhase = ''
-        rsvg-convert -o $out -w 96 -h 96 $src
-      '';
-    };
+    extraStatic."favicon.png" = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
 
     frontends = {
       primary = {
@@ -70,13 +41,31 @@
     };
   };
   services.akkoma.config = let
-    inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkAtom mkMap;
+    inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkAtom mkTuple;
+
+    mapAttrsToListOfTuple = attr: lib.mapAttrsToList (name: value: mkTuple [ name value ]) attr;
+
+    mkMapOfPredefinedKeys = set: let
+      string = value: "\"${(lib.escape [ "\\" "#" "\"" ]) value}\"";
+
+      toElixir = value: 
+        if value == null then "nil" else
+        if lib.isString value then string value else
+        if builtins.isBool value then lib.boolToString value else
+        if lib.isInt value || lib.isFloat value then toString value else
+        abort "Not a elixir value ${value}";
+
+      entries = attrs: lib.concatStringsSep ", " (lib.mapAttrsToList (name: value:
+        "${toElixir name}: ${toElixir value}"
+      ) attrs);
+    in mkRaw "%{${entries set}}";
+
   in {
     ":pleroma" = {
       ":instance" = {
         name = "florp.social";
         email = "contact@florp.social";
-        notify_email = "akkoma@florp.social";
+        notify_email = "noreply@florp.social";
         description = "Likes are now florps. The timeline goes sideways.";
         instance_thumbnail = "/instance/thumbnail.avif";
         limit = 69420;
@@ -90,14 +79,16 @@
         registration_reason_length = 2048;
         account_approval_required = true;
         account_activation_required = true;
-        federation = false;
+        federating = false;
         federation_incoming_replies_max_depth = 1024;
+        federation_reachability_timeout_days = 14;
+        allow_relay = true;
         max_pinned_statuses = 10;
+        max_report_comment_size = 2048;
         safe_dm_mentions = true;
         remote_post_retention_days = 365;
         user_bio_length = 8192;
         user_name_length = 64;
-        max_account_fields = 8;
         cleanup_attachments = true;
         local_bubble = [
           "solitary.social"
@@ -110,11 +101,13 @@
 
       "Pleroma.Web.Endpoint".url.host = "florp.social";
 
+      "Pleroma.Web.Metadata.Providers.Theme".theme_color = "#070F1C";
+
       "Pleroma.Emails.Mailer" = {
         enabled = true;
         adapter = mkRaw "Swoosh.Adapters.SMTP";
         relay = "mail.kyouma.net";
-        username = "akkoma@florp.social";
+        username = "noreply@florp.social";
         password._secret = config.sops.secrets."services/akkoma/mailerPassword".path;
         port = 465;
         ssl = true;
@@ -146,37 +139,42 @@
         "Pleroma.Upload.Filter.AnonymizeFilename"
       ];
 
-      ":mrf" = {
-        transparency = true;
-        policies = map mkRaw [
-          "Pleroma.Web.ActivityPub.MRF.SimplePolicy"
-          "Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy"
-        ];
-      };
+      ":mrf".policies = map mkRaw [
+        "Pleroma.Web.ActivityPub.MRF.SimplePolicy"
+        "Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy"
+        "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy"
+      ];
 
       ":mrf_simple" = {
-        reject = mkMap {
-          "bae.st" = "harassment";
-          "brighteon.social" = "incompatible";
-          "detroitriotcity.com" = "incompatible";
-          "freeatlantis.com" = "incompatible";
-          "freespeechextremist.com" = "incompatible";
-          "gab.com" = "incompatible";
-          "gleasonator.com" = "incompatible";
-          "kitsunemimi.club" = "incompatible";
-          "poa.st" = "incompatible";
-          "seal.cafe" = "harassment";
-          "social.quodverum.com" = "incompatible";
-          "spinster.xyz" = "incompatible";
-          "truthsocial.co.in" = "incompatible";
-          "varishangout.net" = "incompatible";
-
-          "activitypub-troll.cf" = "security";
-          "misskey-forkbomb.cf" = "security";
-          "repl.co" = "security";
+        reject = mapAttrsToListOfTuple {
+          "bae.st" = "transphobia / queerphobia";
+          "brighteon.social" = "transphobia, pro trump";
+          "detroitriotcity.com" = "transphobia / queerphobia";
+          "freeatlantis.com" = "harassment";
+          "freespeechextremist.com" = "N/A";
+          "gab.com" = "N/A";
+          "gleasonator.com" = "transphobia";
+          "kitsunemimi.club" = "transphobia";
+          "kiwifarms.*" = "N/A";
+          "poa.st" = "queerphobia / racism / nazis";
+          "seal.cafe" = "transphobia";
+          "social.quodverum.com" = "N/A";
+          "spinster.xyz" = "transphobia";
+          "truthsocial.co.in" = "N/A";
+          "varishangout.net" = "transphobia";
+          "activitypub-troll.cf" = "N/A";
+          "misskey-forkbomb.cf" = "N/A";
+          "repl.co" = "N/A";
+          "rape.pet" = "CP";
+          "childlove.space" = "CP";
+          "pedo.school" = "CP";
+          "loli.church" = "transphobia";
+          "usasa.ky" = "spam";
+          "tickler.cc" = "spam";
+          "shitposter.club" = "transphobia";
         };
 
-        followers_only = mkMap {
+        followers_only = mapAttrsToListOfTuple {
           "bitcoinhackers.org" = "annoying";
         };
       };
@@ -184,7 +182,7 @@
       ":mrf_object_age".threshold = 180 * 24 * 3600;
 
       ":frontend_configurations" = {
-        pleroma_fe = mkMap {
+        pleroma_fe = mkMapOfPredefinedKeys {
           background = "/images/sylvia-ritter-15012323.avif";
           collapseMessageWithSubject = true;
           streaming = true;
@@ -204,9 +202,10 @@
       };
 
       ":restrict_unauthenticated" = {
-        timelines = mkMap {
+        timelines = mkMapOfPredefinedKeys {
           local = false;
-          federated = true;
+          federated = false;
+          bubble = true;
         };
       };
 
@@ -227,21 +226,44 @@
 
     ":joken".":default_signer"._secret = "/var/lib/secrets/akkoma/jwt-signer";
   };
+  services.postgresql.enable = true;
   services.postgresql.extraPlugins = [
-    pkgs.postgresql15Packages.rum
+    pkgs.postgresql16Packages.rum
   ];
   services.nginx = {
     clientMaxBodySize = "256m";
     commonHttpConfig = ''
-      proxy_cache_path /var/cache/nginx/cache/akkoma-media-cache
+      proxy_cache_path /var/cache/nginx/akkoma-media-cache
         levels= keys_zone=akkoma_media_cache:32m max_size=32g
         inactive=1y use_temp_path=off;
 
       access_log off;
     '';
   };
-  kyouma.nginx.virtualHosts = {
+  kyouma.nginx.virtualHosts = let
+    proxyCache = ''
+      proxy_cache akkoma_media_cache;
+
+      # Cache objects in slices of 1 MiB
+      slice 1m;
+      proxy_cache_key $host$uri$is_args$args$slice_range;
+      proxy_set_header Range $slice_range;
+
+      # Decouple proxy and upstream responses
+      proxy_buffering on;
+      proxy_cache_lock on;
+      proxy_ignore_client_abort on;
+
+      # Default cache times for various responses
+      proxy_cache_valid 200 1y;
+      proxy_cache_valid 206 301 304 1h;
+
+      # Allow serving of stale items
+      proxy_cache_use_stale error timeout invalid_header updating;
+    '';
+  in {
     "florp.social" = {
+      serverAliases = map (x: "${x}.florp.social") [ "a" "b" "c" ];
       locations."/" = {
         proxyPass = "http://unix:/run/akkoma/socket";
         proxyWebsockets = true;
@@ -254,7 +276,9 @@
       useACMEHost = "florp.social";
       locations."/" = {
         proxyPass = "http://unix:/run/akkoma/socket";
-        extraConfig = "rewrite ^(?!/media)(.*)$ /media$1;";
+        extraConfig = ''
+          rewrite ^(?!/media)(.*)$ /media$1;
+        '' + proxyCache;
       };
     };
     
@@ -264,27 +288,12 @@
         proxyPass = "http://unix:/run/akkoma/socket";
         extraConfig = ''
           rewrite ^(?!/proxy)(.*)$ /proxy$1;
-          proxy_cache akkoma_media_cache;
-
-          # Cache objects in slices of 1 MiB
-          slice 1m;
-          proxy_cache_key $host$uri$is_args$args$slice_range;
-          proxy_set_header Range $slice_range;
-
-          # Decouple proxy and upstream responses
-          proxy_buffering on;
-          proxy_cache_lock on;
-          proxy_ignore_client_abort on;
-
-          # Default cache times for various responses
-          proxy_cache_valid 200 1y;
-          proxy_cache_valid 206 301 304 1h;
-
-          # Allow serving of stale items
-          proxy_cache_use_stale error timeout invalid_header updating;
-        '';
+        '' + proxyCache;
       };
     };
   };
-  security.acme.certs."florp.social".extraDomainNames = [ "cache.florp.social" "media.florp.social" ];
+  security.acme.certs."florp.social".extraDomainNames = [
+    "cache.florp.social"
+    "media.florp.social"
+  ] ++ map (x: "${x}.florp.social") [ "a" "b" "c" ];
 }

config/services/nginx.nix

@@ -11,6 +11,7 @@ in {
       email = "noc@kyouma.net";
     };
   };
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
   networking.firewall.allowedUDPPorts = [ 443 ];
   services.nginx = {
     enable = true;

flake.lock

@@ -12,11 +12,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1730257295,
-        "narHash": "sha256-OQl+aAsKiyygvpzck1u0sZf/R4T9zM903CgNDFmmzA8=",
+        "lastModified": 1730906442,
+        "narHash": "sha256-tBuyb8jWBSHHgcIrOfiyQJZGY1IviMzH2V74t7gWfgI=",
         "owner": "zhaofengli",
         "repo": "attic",
-        "rev": "48c8b395bfbc6b76c7eae74df6c74351255a095c",
+        "rev": "d0b66cf897e4d55f03d341562c9821dc4e566e54",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730675461,
-        "narHash": "sha256-Mhqz3p/HEiI/zxBJWO57LYQf6gGlJB0tci6fiVXLjd8=",
+        "lastModified": 1730751873,
+        "narHash": "sha256-sdY29RWz0S7VbaoTwSy6RummdHKf0wUTaBlqPxrtvmQ=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "380847d94ff0fedee8b50ee4baddb162c06678df",
+        "rev": "856a2902156ba304efebd4c1096dbf7465569454",
         "type": "github"
       },
       "original": {
@@ -437,11 +437,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730469723,
-        "narHash": "sha256-5U2aVAXbzd26f0r4+1fo0F4KTqY5h3z2fV0uDJ9YsMQ=",
+        "lastModified": 1730825511,
+        "narHash": "sha256-Ywc4Y+4VobocyxcVhHlJ5Q5h1fOdsJNlAlWlrkqC8U0=",
         "ref": "refs/heads/main",
-        "rev": "16f4a9c871b5417b9ed17e7666c1b266dd8de464",
-        "revCount": 1,
+        "rev": "81bde12357d59215e7d67c7f55c2eb3d54c47689",
+        "revCount": 2,
         "type": "git",
         "url": "https://woof.rip/florp/branding.git"
       },
@@ -483,11 +483,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730302582,
-        "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
+        "lastModified": 1730814269,
+        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
+        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
         "type": "github"
       },
       "original": {
@@ -542,11 +542,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730633670,
-        "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
+        "lastModified": 1730837930,
+        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
+        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
         "type": "github"
       },
       "original": {
@@ -593,16 +593,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1729544999,
-        "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
+        "lastModified": 1729958008,
+        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
         "owner": "NuschtOS",
         "repo": "ixx",
-        "rev": "65c207c92befec93e22086da9456d3906a4e999c",
+        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
         "type": "github"
       },
       "original": {
         "owner": "NuschtOS",
-        "ref": "v0.0.5",
+        "ref": "v0.0.6",
         "repo": "ixx",
         "type": "github"
       }
@@ -693,11 +693,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730448474,
-        "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=",
+        "lastModified": 1730779758,
+        "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e",
+        "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb",
         "type": "github"
       },
       "original": {
@@ -795,11 +795,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1730537918,
-        "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
+        "lastModified": 1730919458,
+        "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
+        "rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
         "type": "github"
       },
       "original": {
@@ -926,11 +926,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1730531603,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
+        "lastModified": 1730785428,
+        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
+        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
         "type": "github"
       },
       "original": {
@@ -957,11 +957,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1730569492,
-        "narHash": "sha256-NByr7l7JetL9kIrdCOcRqBu+lAkruYXETp1DMiDHNQs=",
+        "lastModified": 1730877618,
+        "narHash": "sha256-HQTKujMb6SwnOqtWA+A7lR4MOCBZUW4vtrkK1E/QweU=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "6f210158b03b01a1fd44bf3968165e6da80635ce",
+        "rev": "898246c943ba545a79d585093e97476ceb31f872",
         "type": "github"
       },
       "original": {
@@ -980,11 +980,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730515563,
-        "narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=",
+        "lastModified": 1730760712,
+        "narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e",
+        "rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee",
         "type": "github"
       },
       "original": {
@@ -1038,11 +1038,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1730605784,
-        "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=",
+        "lastModified": 1730883027,
+        "narHash": "sha256-pvXMOJIqRW0trsW+FzRMl6d5PbsM4rWfD5lcKCOrrwI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760",
+        "rev": "c5ae1e214ff935f2d3593187a131becb289ea639",
         "type": "github"
       },
       "original": {
@@ -1072,11 +1072,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1729963473,
-        "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
+        "lastModified": 1730924223,
+        "narHash": "sha256-tGvmW0qih+dCAH9L4BEMYMiHcBoJVZtESbC9WH0EEuw=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
+        "rev": "762c07ee10b381bc8e085be5b6c2ec43139f13b0",
         "type": "github"
       },
       "original": {

modules/nginx/default.nix

@@ -3,11 +3,11 @@
   extraConfig = ''
     add_header Strict-Transport-Security 	$hsts_header;
     add_header Alt-Svc                    'h3=":443"; ma=7776000; persist=1, h2=":443"; ma=7776000; persist=1';
-    #add_header Content-Security-Policy "script-src 'self'; object-src 'none'; base-uri 'none';" always;
-    add_header X-Content-Type-Options 	"nosniff" always;
-    add_header X-XSS-Protection 		"1; mode=block" always;
-    add_header X-Frame-Options 		"SAMEORIGIN" always;
-    add_header Referrer-Policy 		"same-origin" always;
+    #add_header Content-Security-Policy   "script-src 'self'; object-src 'none'; base-uri 'none';" always;
+    add_header X-Content-Type-Options 	  "nosniff" always;
+    add_header X-XSS-Protection 		      "1; mode=block" always;
+    add_header X-Frame-Options 		        "SAMEORIGIN" always;
+    add_header Referrer-Policy 		        "same-origin" always;
   '';
   createHost = vhostName: vhostCfg: {
     extraConfig = lib.optionalString (builtins.hasAttr "extraConfig" vhostCfg) (vhostCfg.extraConfig + "\n" + extraConfig);
@@ -42,9 +42,13 @@ in {
       builtins.mapAttrs (createHost) cfg.virtualHosts) //
       lib.optionalAttrs (cfg.defaultForbidden != null) {
         "redirect" = {
+          quic = true;
+          http3 = true;
+          # reuseport has to be specified on the quic listener
+          # when using worker_processes auto;
+          reuseport = true;
           default = true;
           forceSSL = true;
-          reuseport = true;
           useACMEHost = cfg.defaultForbidden;
           extraConfig = ''
             return 403;

pkgs/akkoma-fe-domi/default.nix

@@ -23,6 +23,11 @@ in {
     # Build scripts assume to be used within a Git repository checkout
     substituteInPlace src/modules/instance.js \
       --replace-fail "widenTimeline: true" 'widenTimeline: "50%"'
+
+    substituteInPlace src/i18n/en.json \
+      --replace-fail "meow" "florp" \
+      --replace-fail "Meow" "Florp"
+
     sed -E -i '/^let commitHash =/,/;$/clet commitHash = "${builtins.substring 0 7 src.rev}";' \
       build/webpack.prod.conf.js
   '';

pkgs/overlay.nix

@@ -6,5 +6,9 @@ final: prev: {
   librespeed-rust = final.callPackage ./librespeed-rust/default.nix {};
   librespeed-go = final.callPackage ./librespeed-go/default.nix {};
   akkoma-fe-domi = final.callPackage ./akkoma-fe-domi/default.nix {};
-  nginxQuic = prev.nginxQuic.override { withSlice = true; };
+  nginxQuic = prev.nginxQuic.override { 
+    withSlice = true;
+    # Use zlib because zlib-ng uses larger buffers then nginx preallocates.
+    zlib = final.zlib;
+  };
 }

pkgs/update-nixfiles/update-nixfiles.sh

@@ -6,6 +6,7 @@ BRANCH="update-inputs-$(date +%Y-%m-%d-%H-%M)"
 HYDRA_URL="https://hydra.kyouma.net"
 JOBSET_URL="${HYDRA_URL}/jobset/nixfiles/update-inputs"
 ROOT="$(mktemp -d)"
+START_TIME="$(date +%s)"
 
 gitin () {
   git -C "${ROOT}/nixfiles" "$@"
@@ -21,20 +22,31 @@ merge_theirs () {
 }
 
 test_build () {
+  local last_error
   local build_jobs
+
   build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")"
   for build in ${build_jobs}; do 
     local build_status
+
     while true; do
       local build_finished
       build_finished="$(curl --fail -s -L -H "Accept: application/json" "${HYDRA_URL}/build/${build}" | jq -r ".finished")"
       [[ ${build_finished} == 1 ]] && break
       sleep 5
     done
+
     build_status="$(curl --fail -s -L -H "Accept: application/json" "${HYDRA_URL}/build/${build}" | jq -r ".buildstatus")"
-    [[ $build_status != 0 ]] && echo "Build ${build} failed" && exit 1
+    [[ $build_status != 0 ]] &&
+      echo "Build ${build} failed" &&
+      exit 1
     echo "Build ${build} was successful"
   done
+
+  last_error="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}" | jq -r ".errortime")"
+  [[ $last_error -gt $START_TIME ]] && 
+    echo "Evaluation error encountered at $(date +%Y-%m-%d-%H:%M:%S --date="${last_error}")" &&
+    exit 1
 }
 
 wait_for_hydra () {
@@ -42,9 +54,9 @@ wait_for_hydra () {
   local hydra_rev
   local counter
   counter=0
-  git_rev="$(git -C "${ROOT}/nixfiles" rev-parse update-inputs)"
+  git_rev="$(git -C "${1}/nixfiles" rev-parse update-inputs)"
   while true; do
-    hydra_rev="$(curl -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r .flake | sed -E "s/.+&rev=(.*)/\1/g")"
+    hydra_rev="$(curl -s -L -H "Accept: application/json" "${2}/latest-eval" | jq -r .flake | sed -E "s/.+&rev=(.*)/\1/g")"
     if [[ "${git_rev}" == "${hydra_rev}" ]]; then
       echo "Hydra got new commit"
       break
@@ -87,7 +99,7 @@ gitin push origin update-inputs
 
 echo "Waiting for hydra to get new commit"
 export -f wait_for_hydra
-timeout 4h bash -c wait_for_hydra
+timeout 4h bash -c "wait_for_hydra ${ROOT} ${JOBSET_URL}"
 
 echo "Testing if all build jobs completed successfully"
 test_build

secrets/services/akkoma.yaml

@@ -8,27 +8,27 @@ sops:
     azure_kv: []
     hc_vault: []
     age:
-        - recipient: age1ht2wetcyl9rzu45e02pqqwgmyfsfe6y6ygxyuxpfhnkdm62d3pqsg3uqvd
+        - recipient: age18vc8rcmczlt3r0ee7jr9s8l3yrkthu8wtypt08eh0eskpkw3dg6qxs7t3t
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZTi9Ha0tQRGE2L3BzclpW
-            NnduRVVRUnhkV1pEOXllZTA0bnN0NENESlM4Ck9jSTcxcjJIdThvUk9IM1FCOGNv
-            V1FNV2ZHbHlTaWNBL0VvSGxhSzlWSDgKLS0tIEFoWEozY0VSWVA0cVp5dkI4NHNH
-            RVQ3aDd0c1RDNWd2eGxiNURGRXVXS2sKTT4LpWSIb9hjrcdUWOhieUeUHop0pwoA
-            OfOv3y3dp7tYc5HRREN5jkVx29jb2lrml0ycu9ek58S8+bolfzN8yQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1NGRYOHFVSXBNdjlpVDhF
+            V0g2ZkRiZnR6UElvWEZKUWxHSjZySlJadHlvCmpBdzBPRklkOVltZWwzNlNrc0pC
+            bG9kU3phNmFKNGkwek94Y2hZcjZCNW8KLS0tIFFqM0VTQXRuODAva0Rkc2xvWFB4
+            VTQ3RExKY093VG8vOThCczRzY2tpY2cKJOv0yVl9Zody0mjtytyjCXpe5V3NsReA
+            /Dqr6V9Hjuf3u0fjMHAjE6hDPGVH5t5NYLkNDeaGHNTaAd5dnhfprg==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-10-31T16:57:58Z"
     mac: ENC[AES256_GCM,data:VJpsLBdnle6bP6ALxLS2eTOEbiHJbNc5D+pvsoJulI9VODtBk0p1VvJv9ilToxh4oiwctMmCKSO4R9NyuZUqoqwwlYtW6tFDITBA2eg/iu/uQjcuuKLC+fFGdtnTpZcShUyMds3qi8Z8Iegk2sSMLk5QXCE2QhMUQ50VN4TXF2c=,iv:rOF34iqckOJMAVm+3RDSdlrJh4hgnyiTut3SM1e0w0E=,tag:cMjMkKkN8UFWGQqQfWBUnA==,type:str]
     pgp:
-        - created_at: "2024-10-31T16:40:38Z"
+        - created_at: "2024-11-04T20:52:58Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hF4D1GtNSlou/HkSAQdAmS/QDuU40+HtiMoCa9byz80b6lGMd6cvqxYShifFxUgw
-            Bn34D6HB6z3nQxWanlOCkA2ud8GBUhEFlLjsQf29apfWuWxKpNv37Olou1/vGvNm
-            0l4BIzFesU+aoIUi+Fp0GbJ1+ObzRvGZq1IULChsDgbbvDnHah7yvN5wKYwj6x7f
-            ZhPpm40+FLea1najiN6igUD6oUy8TSYnCgPODef4FeI0ZwFqF5MaucY8CNuWsugS
-            =1vZk
+            hF4D1GtNSlou/HkSAQdApk/nEYcccQBCzFwC+hZbMio0s37LJuK6ceSLW786Sjsw
+            90ggzfOg63e92cyqYxvbKqtCgVHHU/9RmKdsSZM+rFcR3XpzWw0ke10WjZNW0lU5
+            0l4BuP1sPvP7Z+kxWlITnYl4SPKxVhSmYtAdGbceiGUo36jtpi9vkziuPmyrGttM
+            t1PNZ9gjGVyNw96rRg9bgXCSvJo2FfMx8GeArj1yuO3+bkkbDm7mFrbF6fMQN3JE
+            =Q9iO
             -----END PGP MESSAGE-----
           fp: B04F01A7A98A13020C39B4A68AB7B773A214ACE5
     unencrypted_suffix: _unencrypted