diff --git a/config/services/akkoma/default.nix b/config/services/akkoma/default.nix index 002e8c6..8b86759 100644 --- a/config/services/akkoma/default.nix +++ b/config/services/akkoma/default.nix @@ -13,16 +13,39 @@ services.akkoma = { enable = true; - extraPackages = with pkgs; [ exiftool ffmpeg-headless imagemagick ]; + 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/blobs.gg" = pkgs.akkoma-emoji.blobs_gg; - extraStatic."emoji/florp" = pkgs.runCommandNoCC "florp" { + extraStatic."emoji/custom" = pkgs.runCommandNoCC "florp" { src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon; } '' mkdir $out cp $src $out/florp.png ''; + extraStatic."emoji/neodog" = pkgs.fetchzip { + url = "https://git.gay/moonrabbits/neodog/raw/commit/6f9eb283b6dcbe507fde1110abab267cb2d73b70/neodog.zip"; + hash = "sha256-BO12sKTffQvReQ+7ksLkaC2XSEY2WQ0GQKgBE07pHyg="; + }; + + extraStatic."emoji/neocat" = pkgs.fetchzip { + url = "https://volpeon.ink/emojis/neocat/neocat.zip"; + hash = "sha256-FLtaIqBZqZGC51NX6HiwEzWBlx1GpstZcgpnMDFTuQk="; + }; + + extraStatic."emoji/neofox" = pkgs.fetchzip { + url = "https://volpeon.ink/emojis/neofox/neofox.zip"; + hash = "sha256-zHbiRiEOwGlmm9TRvL25ngCK04rJHzYsLxz2PUjf3GA="; + }; + 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"; @@ -110,6 +133,20 @@ ]; }; + ":emoji".groups = { + "blobs.gg" = "/emoji/blobs.gg/*.png"; + "neodog" = "/emoji/neodog/*.png"; + "neocat" = [ + "/emoji/neocat/*_256.png" + "/emoji/neodog/additional_neocat/*.png" + ]; + "neofox" = [ + "/emoji/neofox/*_256.png" + "/emoji/neodog/additional_neofox/*.png" + ]; + custom = "/emoji/custom/*.png"; + }; + "Pleroma.Captcha".method = mkRaw "Pleroma.Captcha.Kocaptcha"; "Pleroma.Web.Endpoint".url.host = "florp.social"; diff --git a/flake.lock b/flake.lock index fcc4435..24fbdb0 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1731966541, + "narHash": "sha256-AhX8QQBQLRqEWHftFibTmvlmh157134vzBYXW0LOBKo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "d8e769add6333892b44afc107f193074a5072717", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1731895210, - "narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=", + "lastModified": 1732030699, + "narHash": "sha256-SBosboLvLqDv+7mNgRTIYDQbHE61rDDkXTJWiRX3PPo=", "owner": "nix-community", "repo": "disko", - "rev": "639d1520df9417ca2761536c3072688569e83c80", + "rev": "da52cf40206d7d1a419d07640eb47b2fb9ac2c21", "type": "github" }, "original": { @@ -222,11 +222,11 @@ ] }, "locked": { - "lastModified": 1731970906, - "narHash": "sha256-nE9QShMKAKTKtDUauTjNFs9TJ92IVocDJXBhqPWkdCo=", + "lastModified": 1732060369, + "narHash": "sha256-lEZxnDBUWGjav67uHSApQ/2VZ5vs8ltBItJskQkrkbU=", "ref": "refs/heads/main", - "rev": "f36a4ac2b4bd6845e701bdfafc84058652d69faf", - "revCount": 3, + "rev": "58dbdefd018e3ee9a3bba34acafe404b84a23a4e", + "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": { @@ -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": { @@ -636,11 +636,11 @@ ] }, "locked": { - "lastModified": 1731968878, - "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -727,11 +727,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1731683711, - "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=", - "rev": "c859d03013712b349d82ee6223948d6d03e63a8d", + "lastModified": 1731992627, + "narHash": "sha256-OjrXEVD8LtZB5X7LtPCdNx4n5iZOQ2nJmpDlM/foEkI=", + "rev": "f116608a20430b8484814300cdf22eebeb75a59f", "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/f116608a20430b8484814300cdf22eebeb75a59f.tar.gz?rev=f116608a20430b8484814300cdf22eebeb75a59f" }, "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", @@ -830,10 +830,10 @@ ] }, "locked": { - "lastModified": 1731970829, - "narHash": "sha256-Nj64byF1YDQOWcea8m0ifSJZW8rJvF26sB01Acn+Ef4=", + "lastModified": 1732060359, + "narHash": "sha256-VdDkjwuaaSo/FLchb6nta4Q+2uA5YhcQQyJNK0x38pc=", "ref": "refs/heads/main", - "rev": "3fd142ca84ae4c08927402f4aa677a098851504e", + "rev": "850bb54f352a8a22d8abc8c9d55025e9828ee299", "revCount": 1, "type": "git", "url": "https://woof.rip/mikael/neoidiosyn.git" @@ -1099,11 +1099,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1731969202, - "narHash": "sha256-k10MJfCQXUUzkvAQMs8b8UsCjIQQPNWEPMlBrHOoPqU=", + "lastModified": 1732035679, + "narHash": "sha256-J03v1XnxvsrrvHmzKVBZiwik8678IXfkH1/ZR954ujk=", "owner": "nix-community", "repo": "nixvim", - "rev": "2017830a2c81a97f6b7679ea5fa0d921cd0f4535", + "rev": "929bb0cd1cffb9917ab14be9cdb3f27efd6f505f", "type": "github" }, "original": { @@ -1216,11 +1216,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731920923, - "narHash": "sha256-Pqe38TdvfyywhlhpR1WLJlD7uTOGXRRuzpHIh2edOz0=", + "lastModified": 1732036949, + "narHash": "sha256-prZV8HDVvBqHiJLkjElJYoZ6zonV7cOABb8Z0lWonJA=", "owner": "danth", "repo": "stylix", - "rev": "f8699483e46972f64b0dee5d5e41bf4bb142629b", + "rev": "4912f4db00bc931c7636d827e829faf01f6bf155", "type": "github" }, "original": {