Compare commits

..

4 commits

Author SHA1 Message Date
Update Bot
471fe56375
Update from update-inputs-2024-11-20-04-20 2024-11-20 04:20:17 +01:00
Update Bot
f696d77d97
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/5fd852c4155a689098095406500d0ae3d04654a8' (2024-11-14)
  → 'github:nix-community/disko/da52cf40206d7d1a419d07640eb47b2fb9ac2c21' (2024-11-19)
• Updated input 'firefox':
    'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=022ec0becb1ca7b96ddb9bdd046617075357c2cb' (2024-11-17)
  → 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=58dbdefd018e3ee9a3bba34acafe404b84a23a4e' (2024-11-19)
• Updated input 'firefox/neoidiosyn':
    'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=86605e5489fb5045f4dee48de2a69082e17c033b' (2024-11-17)
  → 'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=850bb54f352a8a22d8abc8c9d55025e9828ee299' (2024-11-19)
• Updated input 'firefox/neoidiosyn/lix':
    'c859d03013.tar.gz?narHash=sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE%3D&rev=c859d03013712b349d82ee6223948d6d03e63a8d' (2024-11-15)
  → 'f116608a20.tar.gz?narHash=sha256-OjrXEVD8LtZB5X7LtPCdNx4n5iZOQ2nJmpDlM/foEkI%3D&rev=f116608a20430b8484814300cdf22eebeb75a59f' (2024-11-19)
• Updated input 'firefox/neoidiosyn/lix-module':
    '691193879d.tar.gz?narHash=sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA%3D&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09)
  → 'aa2846680f.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18)
• Updated input 'firefox/neoidiosyn/lix-module/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10' (2024-11-14)
  → 'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294' (2024-11-19)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12)
  → 'github:nixos/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6' (2024-11-16)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
  → 'github:nixos/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add' (2024-11-15)
• Updated input 'nixvim':
    'github:nix-community/nixvim/be455f7f2714ce3479ae5bb662a03bd450f45793' (2024-11-15)
  → 'github:nix-community/nixvim/929bb0cd1cffb9917ab14be9cdb3f27efd6f505f' (2024-11-19)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/6c71c49e2448e51ad830ed211024e6d0edc50116' (2024-11-12)
  → 'github:lnl7/nix-darwin/c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5' (2024-11-17)
• Updated input 'nixvim/nuschtosSearch':
    'github:NuschtOS/search/135d202e032be70c93b6d7d53592ef4799d6efde' (2024-11-11)
  → 'github:NuschtOS/search/fe07070f811b717a4626d01fab714a87d422a9e1' (2024-11-18)
• Updated input 'nixvim/nuschtosSearch/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'nixvim/treefmt-nix':
    'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30)
  → 'github:numtide/treefmt-nix/579b9a2fd0020cd9cd81a4ef4eab2dca4d20c94c' (2024-11-18)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4c91d52db103e757fc25b58998b0576ae702d659' (2024-11-11)
  → 'github:Mic92/sops-nix/e39947d0ee8e341fa7108bd02a33cdfa24a1360e' (2024-11-18)
• Removed input 'sops-nix/nixpkgs-stable'
• Updated input 'stylix':
    'github:danth/stylix/5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f' (2024-11-15)
  → 'github:danth/stylix/4912f4db00bc931c7636d827e829faf01f6bf155' (2024-11-19)
• Updated input 'stylix/base16':
    'github:SenchoPens/base16.nix/665b3c6748534eb766c777298721cece9453fdae' (2024-02-25)
  → 'github:SenchoPens/base16.nix/d8e769add6333892b44afc107f193074a5072717' (2024-11-18)
• Updated input 'stylix/base16/fromYaml':
    'github:SenchoPens/fromYaml/11fbbbfb32e3289d3c631e0134a23854e7865c84' (2023-07-16)
  → 'github:SenchoPens/fromYaml/106af9e2f715e2d828df706c386a685698f3223b' (2024-11-18)
2024-11-20 04:20:15 +01:00
6321527dff
akkoma: add more emojis 2024-11-19 21:37:58 +01:00
c433ef2997
akkoma: Build ImageMagick with SVT-AV1 encoder 2024-11-19 20:36:55 +01:00
2 changed files with 75 additions and 38 deletions

View file

@ -13,16 +13,39 @@
services.akkoma = { services.akkoma = {
enable = true; 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/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; src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
} '' } ''
mkdir $out mkdir $out
cp $src $out/florp.png 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 ( extraStatic."static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // { builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
elly-mod = "/static/themes/elly-mod.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.Captcha".method = mkRaw "Pleroma.Captcha.Kocaptcha";
"Pleroma.Web.Endpoint".url.host = "florp.social"; "Pleroma.Web.Endpoint".url.host = "florp.social";

View file

@ -30,11 +30,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1708890466, "lastModified": 1731966541,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", "narHash": "sha256-AhX8QQBQLRqEWHftFibTmvlmh157134vzBYXW0LOBKo=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae", "rev": "d8e769add6333892b44afc107f193074a5072717",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731895210, "lastModified": 1732030699,
"narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=", "narHash": "sha256-SBosboLvLqDv+7mNgRTIYDQbHE61rDDkXTJWiRX3PPo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "639d1520df9417ca2761536c3072688569e83c80", "rev": "da52cf40206d7d1a419d07640eb47b2fb9ac2c21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731970906, "lastModified": 1732060369,
"narHash": "sha256-nE9QShMKAKTKtDUauTjNFs9TJ92IVocDJXBhqPWkdCo=", "narHash": "sha256-lEZxnDBUWGjav67uHSApQ/2VZ5vs8ltBItJskQkrkbU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f36a4ac2b4bd6845e701bdfafc84058652d69faf", "rev": "58dbdefd018e3ee9a3bba34acafe404b84a23a4e",
"revCount": 3, "revCount": 4,
"type": "git", "type": "git",
"url": "https://woof.rip/mikael/firefox.git" "url": "https://woof.rip/mikael/firefox.git"
}, },
@ -366,11 +366,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -547,11 +547,11 @@
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1689549921, "lastModified": 1731966426,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "fromYaml", "repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", "rev": "106af9e2f715e2d828df706c386a685698f3223b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -636,11 +636,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731968878, "lastModified": 1732025103,
"narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a42fa14b53ceab66274a21da480c9f8e06204173", "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -727,11 +727,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731683711, "lastModified": 1731992627,
"narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=", "narHash": "sha256-OjrXEVD8LtZB5X7LtPCdNx4n5iZOQ2nJmpDlM/foEkI=",
"rev": "c859d03013712b349d82ee6223948d6d03e63a8d", "rev": "f116608a20430b8484814300cdf22eebeb75a59f",
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@ -754,11 +754,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731185731, "lastModified": 1731967274,
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", "rev": "aa2846680fa9a2032939d720487942567fd9eb63",
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@ -830,10 +830,10 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731970829, "lastModified": 1732060359,
"narHash": "sha256-Nj64byF1YDQOWcea8m0ifSJZW8rJvF26sB01Acn+Ef4=", "narHash": "sha256-VdDkjwuaaSo/FLchb6nta4Q+2uA5YhcQQyJNK0x38pc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3fd142ca84ae4c08927402f4aa677a098851504e", "rev": "850bb54f352a8a22d8abc8c9d55025e9828ee299",
"revCount": 1, "revCount": 1,
"type": "git", "type": "git",
"url": "https://woof.rip/mikael/neoidiosyn.git" "url": "https://woof.rip/mikael/neoidiosyn.git"
@ -1099,11 +1099,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1731969202, "lastModified": 1732035679,
"narHash": "sha256-k10MJfCQXUUzkvAQMs8b8UsCjIQQPNWEPMlBrHOoPqU=", "narHash": "sha256-J03v1XnxvsrrvHmzKVBZiwik8678IXfkH1/ZR954ujk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2017830a2c81a97f6b7679ea5fa0d921cd0f4535", "rev": "929bb0cd1cffb9917ab14be9cdb3f27efd6f505f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1216,11 +1216,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1731920923, "lastModified": 1732036949,
"narHash": "sha256-Pqe38TdvfyywhlhpR1WLJlD7uTOGXRRuzpHIh2edOz0=", "narHash": "sha256-prZV8HDVvBqHiJLkjElJYoZ6zonV7cOABb8Z0lWonJA=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "f8699483e46972f64b0dee5d5e41bf4bb142629b", "rev": "4912f4db00bc931c7636d827e829faf01f6bf155",
"type": "github" "type": "github"
}, },
"original": { "original": {