flake.lock: Update

Flake lock file updates:

• 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/2e78b1af8025108ecd6edaa3ab09695b8a4d3d55' (2024-11-05)
• 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/3d24cb72618738130e6af9c644c81fe42aa34ebc' (2024-11-05)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/683d0c4cd1102dcccfa3f835565378c7f3cbe05e' (2024-11-01)
  → 'github:lnl7/nix-darwin/4652874d014b82cb746173ffc64f6a70044daa7e' (2024-11-03)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/e9b5eef9b51cdf966c76143e13a9476725b2f760' (2024-11-03)
  → 'github:Mic92/sops-nix/59d6988329626132eaf107761643f55eb979eef1' (2024-11-04)

.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,4 +1,4 @@
-{ config, inputs, pkgs, ... }: {
+{ config, inputs, lib, pkgs, ... }: {
   sops.secrets."services/akkoma/mailerPassword" = {
     sopsFile = ../../../secrets/services/akkoma.yaml;
   };
@@ -38,23 +38,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 +54,14 @@
     };
   };
   services.akkoma.config = let
-    inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkAtom mkMap;
+    inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkAtom mkMap mkTuple;
+    mapAttrsToListOfTuple = attr: lib.mapAttrsToList (name: value: mkTuple [ name value ]) attr;
   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;
@@ -114,7 +99,7 @@
         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,16 +131,13 @@
         "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"
+      ];
 
       ":mrf_simple" = {
-        reject = mkMap {
+        reject = mapAttrsToListOfTuple {
           "bae.st" = "harassment";
           "brighteon.social" = "incompatible";
           "detroitriotcity.com" = "incompatible";
@@ -170,13 +152,12 @@
           "spinster.xyz" = "incompatible";
           "truthsocial.co.in" = "incompatible";
           "varishangout.net" = "incompatible";
-
           "activitypub-troll.cf" = "security";
           "misskey-forkbomb.cf" = "security";
           "repl.co" = "security";
         };
 
-        followers_only = mkMap {
+        followers_only = mapAttrsToListOfTuple {
           "bitcoinhackers.org" = "annoying";
         };
       };
@@ -227,13 +208,14 @@
 
     ":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;
 

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

@@ -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"
       },
@@ -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": {
@@ -693,11 +693,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730448474,
-        "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=",
+        "lastModified": 1730600078,
+        "narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e",
+        "rev": "4652874d014b82cb746173ffc64f6a70044daa7e",
         "type": "github"
       },
       "original": {
@@ -795,11 +795,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1730537918,
-        "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
+        "lastModified": 1730828750,
+        "narHash": "sha256-XrnZLkLiBYNlwV5gus/8DT7nncF1TS5la6Be7rdVOpI=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
+        "rev": "2e78b1af8025108ecd6edaa3ab09695b8a4d3d55",
         "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": 1730792264,
+        "narHash": "sha256-Ue3iywjyaNOxXgw7esVSBX3bZzM2bSPubZamYsBKIG8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "6f210158b03b01a1fd44bf3968165e6da80635ce",
+        "rev": "3d24cb72618738130e6af9c644c81fe42aa34ebc",
         "type": "github"
       },
       "original": {
@@ -1038,11 +1038,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1730605784,
-        "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=",
+        "lastModified": 1730746162,
+        "narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760",
+        "rev": "59d6988329626132eaf107761643f55eb979eef1",
         "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/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;
+  };
 }

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