From e5004ed8fde564dbee8a00af34093fe8c33344de Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 1 Nov 2024 15:11:59 +0100 Subject: [PATCH 1/2] akkoma: add branding --- config/services/akkoma/default.nix | 9 +++------ flake.lock | 21 +++++++++++++++++++++ flake.nix | 4 ++++ pkgs/akkoma-fe-domi/default.nix | 2 ++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/config/services/akkoma/default.nix b/config/services/akkoma/default.nix index 2bec116..af03b23 100644 --- a/config/services/akkoma/default.nix +++ b/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 @@

Likes are now florps. The timeline goes sideways.

''; - extraStatic."images/akkoma-wp.png" = pkgs.fetchurl { - url = "https://kyouma.net/akkoma-wp.avif"; - hash = "sha256-p0slibhwLExsGUzCSZHIl6tNm28r4fB3iJsI6peRFRs="; - }; + extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.wallpaper; 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; diff --git a/flake.lock b/flake.lock index 1e7ad48..7be0950 100644 --- a/flake.lock +++ b/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": { @@ -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", diff --git a/flake.nix b/flake.nix index 266eb9d..f92ed80 100644 --- a/flake.nix +++ b/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"; diff --git a/pkgs/akkoma-fe-domi/default.nix b/pkgs/akkoma-fe-domi/default.nix index 83781a2..1ffd048 100644 --- a/pkgs/akkoma-fe-domi/default.nix +++ b/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 ''; From 0ba6f7874b25f012ca0f623bb27dc02a4c0b8a0f Mon Sep 17 00:00:00 2001 From: Update Bot Date: Sat, 2 Nov 2024 04:20:15 +0100 Subject: [PATCH 2/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/e83414058edd339148dc142a8437edb9450574c8' (2024-10-27) → 'github:nix-community/home-manager/1743615b61c7285976f85b303a36cdf88a556503' (2024-11-01) • Updated input 'nixvim': 'github:nix-community/nixvim/42ea1626cb002fa759a6b1e2841bfc80a4e59615' (2024-10-31) → 'github:nix-community/nixvim/356896f58dde22ee16481b7c954e340dceec340d' (2024-11-01) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 7be0950..1cf6ff1 100644 --- a/flake.lock +++ b/flake.lock @@ -542,11 +542,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1730490306, + "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "1743615b61c7285976f85b303a36cdf88a556503", "type": "github" }, "original": { @@ -957,11 +957,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1730368298, - "narHash": "sha256-5z4pDqRSSovXPPtN1BNEJOkGoCd/XSYuCWh8AsvoTio=", + "lastModified": 1730499477, + "narHash": "sha256-olt0Sx4alDxv3ko9BgbV3SsE2KQ/Tf0/Az1Fr9s2Y6U=", "owner": "nix-community", "repo": "nixvim", - "rev": "42ea1626cb002fa759a6b1e2841bfc80a4e59615", + "rev": "356896f58dde22ee16481b7c954e340dceec340d", "type": "github" }, "original": {