Update from update-inputs-2024-11-02-04-20

config/services/akkoma/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, inputs, pkgs, ... }: {
   sops.secrets."services/akkoma/mailerPassword" = {
     sopsFile = ../../../secrets/services/akkoma.yaml;
   };
@@ -35,10 +35,7 @@
       <h3>Likes are now florps. The timeline goes sideways.</h3>
     '';
 
-    extraStatic."images/akkoma-wp.png" = pkgs.fetchurl {
+    extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.wallpaper;
-      url = "https://kyouma.net/akkoma-wp.avif";
-      hash = "sha256-p0slibhwLExsGUzCSZHIl6tNm28r4fB3iJsI6peRFRs=";
-    };
 
     extraStatic."favicon.png" = let
       rev = "697a8211b0f427a921e7935a35d14bb3e32d0a2c";
@@ -184,7 +181,7 @@
 
       ":frontend_configurations" = {
         pleroma_fe = mkMap {
-          background = "/images/akkoma-wp.png";
+          background = "/images/sylvia-ritter-15012323.avif";
           collapseMessageWithSubject = true;
           hideSiteFavicon = true;
           streaming = true;

flake.lock

@@ -430,6 +430,26 @@
         "type": "github"
       }
     },
+    "florp-branding": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730469723,
+        "narHash": "sha256-5U2aVAXbzd26f0r4+1fo0F4KTqY5h3z2fV0uDJ9YsMQ=",
+        "ref": "refs/heads/main",
+        "rev": "16f4a9c871b5417b9ed17e7666c1b266dd8de464",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://woof.rip/florp/branding.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://woof.rip/florp/branding.git"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -522,11 +542,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730016908,
+        "lastModified": 1730490306,
-        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
+        "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e83414058edd339148dc142a8437edb9450574c8",
+        "rev": "1743615b61c7285976f85b303a36cdf88a556503",
         "type": "github"
       },
       "original": {
@@ -937,11 +957,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1730368298,
+        "lastModified": 1730499477,
-        "narHash": "sha256-5z4pDqRSSovXPPtN1BNEJOkGoCd/XSYuCWh8AsvoTio=",
+        "narHash": "sha256-olt0Sx4alDxv3ko9BgbV3SsE2KQ/Tf0/Az1Fr9s2Y6U=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "42ea1626cb002fa759a6b1e2841bfc80a4e59615",
+        "rev": "356896f58dde22ee16481b7c954e340dceec340d",
         "type": "github"
       },
       "original": {
@@ -996,6 +1016,7 @@
         "dns": "dns",
         "fernglas": "fernglas",
         "flake-utils": "flake-utils",
+        "florp-branding": "florp-branding",
         "home-manager": "home-manager",
         "hydra": "hydra",
         "kyouma-www": "kyouma-www",

flake.nix

@@ -21,6 +21,10 @@
       url = "github:wobcom/fernglas";
       inputs.flake-utils.follows = "flake-utils";
     };
+    florp-branding = {
+      url = "git+https://woof.rip/florp/branding.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";

pkgs/akkoma-fe-domi/default.nix

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