emily/nixfiles
emily/nixfiles
1
0
Fork 1
Code Issues Pull requests Activity

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

Browse source
This commit is contained in:
Update Bot 2024-11-15 04:20:45 +01:00
commit 63dac6936a
No known key found for this signature in database
6 changed files with 93 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
config/services/akkoma/default.nix
View file

@ -1,4 +1,9 @@
{ config, inputs, lib, pkgs, ... }: { { config, inputs, lib, pkgs, ... }: {
imports = [
inputs.florp-moderation.nixosModules.default
# Moderated instances. See https://woof.rip/florp/moderation for more information.
inputs.florp-moderation.nixosModules.florp
];
sops.secrets."services/akkoma/mailerPassword" = { sops.secrets."services/akkoma/mailerPassword" = {
sopsFile = ../../../secrets/services/akkoma.yaml; sopsFile = ../../../secrets/services/akkoma.yaml;
}; };
@ -27,7 +32,9 @@
extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json); extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
extraStatic."static/custom.css" = pkgs.writeText "custom.css" '' extraStatic."static/custom.css" = pkgs.writeText "custom.css" ''
.tos-content img { max-width: 100%; } .tos-content img, .terms-of-service img {
max-width: 100%;
}
''; '';
extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default; extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
@ -42,16 +49,14 @@
ref = "5f0339ce00"; ref = "5f0339ce00";
}; };
admin = { admin = {
package = pkgs.akkoma-frontends.admin-fe; package = pkgs.akkoma-admin-fe;
name = "admin-fe"; name = "admin-fe";
ref = "stable"; ref = "stable";
}; };
}; };
}; };
services.akkoma.config = let services.akkoma.config = let
inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkAtom mkTuple; inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkAtom;
mapAttrsToListOfTuple = attr: lib.mapAttrsToList (name: value: mkTuple [ name value ]) attr;
mkMapOfPredefinedKeys = set: let mkMapOfPredefinedKeys = set: let
string = value: "\"${(lib.escape [ "\\" "#" "\"" ]) value}\""; string = value: "\"${(lib.escape [ "\\" "#" "\"" ]) value}\"";
@ -79,10 +84,10 @@
limit = 69420; limit = 69420;
description_limit = 69420; description_limit = 69420;
remote_limit = 131072; remote_limit = 131072;
upload_limit = 160 * 1024 * 1024; upload_limit = 256 * 1024 * 1024;
avatar_upload_limit = 16 * 1024 * 1024; avatar_upload_limit = 4 * 1024 * 1024;
background_upload_limit = 32 * 1024 * 1024; background_upload_limit = 8 * 1024 * 1024;
banner_upload_limit = 32 * 1024 * 1024; banner_upload_limit = 8 * 1024 * 1024;
registrations_open = true; registrations_open = true;
registration_reason_length = 2048; registration_reason_length = 2048;
account_approval_required = true; account_approval_required = true;
@ -148,45 +153,9 @@
]; ];
":mrf".policies = map mkRaw [ ":mrf".policies = map mkRaw [
"Pleroma.Web.ActivityPub.MRF.SimplePolicy"
"Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy"
"Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy" "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy"
]; ];
":mrf_simple" = {
reject = mapAttrsToListOfTuple {
"bae.st" = "transphobia, queerphobia";
"brighteon.social" = "transphobia, right‐wing extremism";
"detroitriotcity.com" = "transphobia, queerphobia";
"freeatlantis.com" = "harassment";
"freespeechextremist.com" = "N/A";
"gab.com" = "N/A";
"gleasonator.com" = "transphobia";
"kitsunemimi.club" = "transphobia";
"kiwifarms.*" = "harassment";
"poa.st" = "queerphobia, racism, right‐wing extremism";
"seal.cafe" = "transphobia";
"social.quodverum.com" = "N/A";
"spinster.xyz" = "transphobia";
"truthsocial.co.in" = "N/A";
"varishangout.net" = "transphobia";
"activitypub-troll.cf" = "N/A";
"misskey-forkbomb.cf" = "security";
"repl.co" = "N/A";
"rape.pet" = "CSAM";
"childlove.space" = "CSAM";
"pedo.school" = "CSAM";
"loli.church" = "transphobia";
"usasa.ky" = "spam";
"tickler.cc" = "spam";
"shitposter.club" = "transphobia";
};
followers_only = mapAttrsToListOfTuple {
"bitcoinhackers.org" = "annoying";
};
};
":mrf_object_age".threshold = 180 * 24 * 3600; ":mrf_object_age".threshold = 180 * 24 * 3600;
":frontend_configurations" = { ":frontend_configurations" = {
@ -198,7 +167,6 @@
webPushNotifications = true; webPushNotifications = true;
useStreamingApi = true; useStreamingApi = true;
scopeCopy = true; scopeCopy = true;
showFeaturesPanel = false;
subjectLineBehavior = "masto"; subjectLineBehavior = "masto";
alwaysShowSubjectInput = true; alwaysShowSubjectInput = true;
postContentType = "text/markdown"; postContentType = "text/markdown";
@ -279,6 +247,12 @@
}; };
locations."^/media(/.*)$".return = "308 https://media.florp.social$1"; locations."^/media(/.*)$".return = "308 https://media.florp.social$1";
locations."^/proxy(/.*)$".return = "308 https://cache.florp.social$1"; locations."^/proxy(/.*)$".return = "308 https://cache.florp.social$1";
locations."= /api/v1/pleroma/admin/config" = {
return = ''200 "\{\"error\":\"You must enable configurable_from_database in your config file.\"\}"'';
extraConfig = ''
types { } default_type "application/json; charset=utf-8";
'';
};
}; };
"media.florp.social" = { "media.florp.social" = {

71
flake.lock
View file

@ -437,11 +437,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731279732, "lastModified": 1731582952,
"narHash": "sha256-eZllHPzbjvTNrzImqtDrs0k1LsIIeTlp8MMN9SxMvvE=", "narHash": "sha256-hnvqHeekGal+hml6BQB254LsJn+Vk5QNKzkIu8rH/xs=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "2f1130b23576a403b9b1d70d6431649bfa044621", "rev": "f283dba73f777746e1675126f8fa4c5b1fd06152",
"revCount": 8, "revCount": 10,
"type": "git", "type": "git",
"url": "https://woof.rip/florp/about.git" "url": "https://woof.rip/florp/about.git"
}, },
@ -470,6 +470,26 @@
"url": "https://woof.rip/florp/branding.git" "url": "https://woof.rip/florp/branding.git"
} }
}, },
"florp-moderation": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1731611636,
"narHash": "sha256-Do8vpR8JTpkPr9vxf1aRzhb4/cUBjg5twPyGDyezxJw=",
"ref": "refs/heads/main",
"rev": "32e1061cb2ef3cd0eab0bd99f062a2776a73d459",
"revCount": 7,
"type": "git",
"url": "https://woof.rip/florp/moderation.git"
},
"original": {
"type": "git",
"url": "https://woof.rip/florp/moderation.git"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -503,11 +523,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730814269, "lastModified": 1731363552,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2", "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -562,11 +582,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731535640, "lastModified": 1731604581,
"narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "35b055009afd0107b69c286fca34d2ad98940d57", "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -713,11 +733,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731153869, "lastModified": 1731454423,
"narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "5c74ab862c8070cbf6400128a1b56abb213656da", "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -946,11 +966,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1731139594, "lastModified": 1731319897,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -977,11 +997,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1731527733, "lastModified": 1731571290,
"narHash": "sha256-12OpSgbLDiKmxvBXwVracIfGI9FpjFyHpa1r0Ho+NFA=", "narHash": "sha256-osvW1d7YxBs5UDRN/RLFqVtWegArqhvonL9odVpWMuc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "f11a877bcc1d66cc8bd7990c704f91c1e99c7d08", "rev": "24fe0dd2478643fcd4dd57c9570b4614fac80144",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1000,11 +1020,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731060242, "lastModified": 1731347683,
"narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=", "narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "ef493352f9e1f051e01a55c062731503a6b36b4e", "rev": "135d202e032be70c93b6d7d53592ef4799d6efde",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1038,6 +1058,7 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"florp-about": "florp-about", "florp-about": "florp-about",
"florp-branding": "florp-branding", "florp-branding": "florp-branding",
"florp-moderation": "florp-moderation",
"home-manager": "home-manager", "home-manager": "home-manager",
"hydra": "hydra", "hydra": "hydra",
"kyouma-www": "kyouma-www", "kyouma-www": "kyouma-www",
@ -1093,11 +1114,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1731537763, "lastModified": 1731577695,
"narHash": "sha256-dOjxeHAXbQ4KRe5j9uClFp8SyYY2r62bbsdraETtO84=", "narHash": "sha256-ohxX2gG7zDWIA3slEbiSyAVSiO98clCoL+CmiEiYwVU=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "be94701ce7b746cb020e667f71492e398ed470f4", "rev": "e0a278871b63b1800ccdda568861b5324dd93797",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View file

@ -21,12 +21,16 @@
url = "github:wobcom/fernglas"; url = "github:wobcom/fernglas";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
florp-about = {
url = "git+https://woof.rip/florp/about.git";
inputs.nixpkgs.follows = "nixpkgs";
};
florp-branding = { florp-branding = {
url = "git+https://woof.rip/florp/branding.git"; url = "git+https://woof.rip/florp/branding.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
florp-about = { florp-moderation = {
url = "git+https://woof.rip/florp/about.git"; url = "git+https://woof.rip/florp/moderation.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {

7
pkgs/akkoma-admin-fe/default.nix Normal file
View file

@ -0,0 +1,7 @@
{
akkoma-frontends
}:
akkoma-frontends.admin-fe.overrideAttrs {
patches = [ ./disable-options.patch ];
}

12
pkgs/akkoma-admin-fe/disable-options.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/config/prod.env.js b/config/prod.env.js
index 7acb93a2..ea500e99 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,6 @@ module.exports = {
NODE_ENV: '"production"',
ENV_CONFIG: '"prod"',
BASE_API: '"https://api-prod"',
- DISABLED_FEATURES: '[""]',
+ DISABLED_FEATURES: '["settings","media-proxy-cache","relays"]',
ASSETS_PUBLIC_PATH: '/pleroma/admin/'
}

1
pkgs/overlay.nix
View file

@ -6,6 +6,7 @@ final: prev: {
librespeed-rust = final.callPackage ./librespeed-rust/default.nix {}; librespeed-rust = final.callPackage ./librespeed-rust/default.nix {};
librespeed-go = final.callPackage ./librespeed-go/default.nix {}; librespeed-go = final.callPackage ./librespeed-go/default.nix {};
akkoma-fe-domi = final.callPackage ./akkoma-fe-domi/default.nix {}; akkoma-fe-domi = final.callPackage ./akkoma-fe-domi/default.nix {};
akkoma-admin-fe = final.callPackage ./akkoma-admin-fe/default.nix {};
nginxQuic = prev.nginxQuic.override { nginxQuic = prev.nginxQuic.override {
withSlice = true; withSlice = true;
# Use zlib because zlib-ng uses larger buffers then nginx preallocates. # Use zlib because zlib-ng uses larger buffers then nginx preallocates.