diff --git a/modules/nixos/services/akkoma/blocklist.nix b/modules/nixos/services/akkoma/blocklist.nix deleted file mode 100644 index fdee7da3..00000000 --- a/modules/nixos/services/akkoma/blocklist.nix +++ /dev/null @@ -1,103 +0,0 @@ -# Largely borrowed from https://github.com/chaossocial/about/blob/5137496d328dab0c5dbcddfcf90b467dfe21bc1e/blocked_instances.md -{ - media_nsfw = { - "sinblr.com" = "Untagged NSFW content"; - }; - - reject = { - "bae.st" = ''Discrimination, racism, "free speech zone"²''; - "baraag.net" = "Lolicon"; - "beta.birdsite.live" = "Twitter crossposter"; - "birb.elfenban.de" = "Twitter crossposter"; - "bird.evilcyberhacker.net" = "Twitter crossposter"; - "bird.froth.zone" = "Twitter crossposter"; - "bird.nzbr.de" = "Twitter crossposter"; - "birdbots.leptonics.com" = "Twitter crossposter"; - "birdsite.b93.dece.space" = "Twitter crossposter"; - "birdsite.link" = "Twitter crossposter"; - "birdsite.monster" = "Twitter crossposter"; - "birdsite.slashdev.space" = "Twitter crossposter"; - "birdsitelive.treffler.cloud" = "Twitter crossposter"; - "birdsite.thorlaksson.com" = "Twitter crossposter"; - "birdsite.wilde.cloud" = "Twitter crossposter"; - "bridge.birb.space" = "Twitter crossposter"; - "brighteon.social" = ''"free speech zone"²''; - "cawfee.club" = ''Discrimination, racism, "free speech zone"²''; - "chudbuds.lol" = ''Discrimination, racism, "free speech zone"²''; - "club.darknight-coffee.eu" = ''"free speech zone"²''; - "comfyboy.club" = "Discrimination, racism"; - "daishouri.moe" = "Fascism, openly advertises with swastika"; - "detroitriotcity.com" = ''Discrimination, racism, "free speech zone"²''; - "freeatlantis.com" = "Conspiracy theory instance"; - "freefedifollowers.ga" = "Follower spam"; - "frennet.link" = ''Discrimination, racism, "free speech zone"²''; - "freespeechextremist.com" = ''Discrimination, racism, "free speech zone"²''; - "f.header.net" = "Discrimination"; - "gab.com, gab.ai" = ''Discrimination, racism, "free speech zone"²''; - "gameliberty.club" = ''"free speech zone"²''; - "gegenstimme.tv" = ''"free speech zone"²''; - "gitmo.life" = ''"free speech zone"²''; - "glindr.org" = "Discrimination"; - "glowers.club" = ''Discrimination, racism, "free speech zone"²''; - "honkwerx.tech" = "Racism"; - "iddqd.social" = ''Discrimination, racism, "free speech zone"²''; - "itmslaves.com" = ''"free speech zone"², noagenda affiliated''; - "jaeger.website" = ''Discrimination, racism, "free speech zone"²''; - "kenfm.quadplay.tv" = "Conspiracy videos"; - "kiwifarms.cc" = "Discrimination"; - "libre.tube" = "Promotion of violence and murder, multiple other violations of our rules"; - "lolicon.rocks" = "Lolicon"; - "mastodon.network" = "Imperaonation linking to porn"; - "mastodon.popps.org" = "Homophobia"; - "meta-tube.de" = "Conspiracy, CoVid19 denier videos"; - "mostr.pub" = "nostr, unmoderated"; - "midnightride.rs" = "Discrimination"; - "mstdn.foxfam.club" = "Right wing twitter mirror"; - "nicecrew.digital" = ''Discrimination, racism, "free speech zone"²''; - "ns.auction" = "Racism etc"; - "newjack.city" = "Exclusive to unwanted follow bots"; - "noagendasocial.com" = ''"free speech zone"², harassment''; - "ohai.su" = "Offline"; - "outpoa.st" = ''"free speech zone"''; - "pawoo.net" = "Untagged nfsw content, unwanted follow bots, lolicon***"; - "paypig.org" = "Racism"; - "pieville.net" = "Racism, antisemitism"; - "play.xmr.101010.pl" = "Cryptomining"; - "pleroma.rareome.ga" = "Doesn't respect blocks or status privacy, lolicons³"; - "pleroma.kitsunemimi.club" = "Discrimination"; - "pleroma.narrativerry.xyz" = ''Discrimination, racism, "free speech zone"²''; - "pleroma.nobodyhasthe.biz" = "Doxxing and discrimination"; - "pl.natehiggers.online" = "Racism"; - "pl.info.natehiggers.online" = "Racism"; - "pl.tkammer.de" = "Transphobia"; - "poa.st" = "Discrimination"; - "shitpost.cloud" = ''"Free speech zone"²''; - "shitposter.club" = ''"Free speech zone"²''; - "skippers-bin.com" = "Same admin as neckbeard.xyz, same behaviour"; - "sneak.berlin" = "privacy violation"; - "social.urspringer.de" = "Conspiracy, CoVid19 denier"; - "social.ancreport.com" = ''Discrimination, racism, "free speech zone"²''; - "socnet.supes.com" = ''Right wing "free speech zone"²''; - "solagg.com" = "Scammers"; - "spinster.xyz" = "Discrimination"; - "toot.canberrasocial.net" = ''"free speech zone"²''; - "truthsocial.co.in" = "Alt-right trolls"; - "tube.kenfm.de" = "Conspiracy videos"; - "tube.querdenken-711.de" = "Conspiracy videos"; - "twitter.activitypub.actor" = "Twitter crossposting bots breaking mentions"; - "twtr.plus" = "Twitter crossposting bots breaking mentions"; - "varishangout.net" = "Transphobia, aggressive trolling"; - "wiki-tube.de" = "Right wing conspiracy videos"; - "wintermute.fr.to" = "Discrimination"; - "yggdrasil.social" = "Discrimination"; - "fedi.tyil.nl" = "Misogy, Discrimination"; - "imouto.pics" = "Lolicon, pedophilia"; - "yesmap.net" = "pedophilia"; - "layer02.net" = "Transphobia"; - "paravielfalt.zone" = "pedophilia"; - }; - - followers_only = { - "beta.birdsite.live" = "Avoid polluting timelines with Twitter posts"; - }; -} diff --git a/modules/nixos/services/akkoma/default.nix b/modules/nixos/services/akkoma/default.nix deleted file mode 100644 index 25081b88..00000000 --- a/modules/nixos/services/akkoma/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ - lib, - self, - pkgs, - config, - extpkgs, - ... -}: -let - inherit (lib.modules) mkIf; - inherit (self.lib.services) mkServiceOption; - - inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkMap; - - rdomain = config.networking.domain; - cfg = config.garden.services.akkoma; -in -{ - options.garden.services.akkoma = mkServiceOption "akkoma" { domain = "akko.${rdomain}"; }; - - config = mkIf cfg.enable { - services = { - akkoma = { - enable = true; - extraPackages = builtins.attrValues { inherit (pkgs) ffmpeg exiftool imagemagick; }; - - # produces a warning when sudo is not installed - # its just `sudo -s akkoma pleroma_ctl` anyways - installWrapper = false; - - extraStatic = { - "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" "Just be normal please"; - - "favicon.png" = pkgs.fetchurl { - name = "akkoma-favicon.png"; - url = "https://gravatar.com/avatar/c487c810e09878b4bd90df713a7c9523?size=512"; - hash = "sha256-GjgRf5hI9OBdIc6iX7YiSmNLFDMkz047vHFQcYxkRNg="; - }; - - "emoji/blobs" = pkgs.blobs_gg; - "emoji/awesome" = extpkgs.emojis; - }; - - config = { - ":pleroma"."Pleroma.Web.Endpoint".url.host = cfg.domain; - ":pleroma"."Pleroma.Upload".base_url = "https://${cfg.domain}:443/media"; - - ":pleroma".":instance" = { - name = "not localhost"; - description = "Isabel Roses' akkoma instance"; - email = "isabel@isabelroses.com"; - notify_email = "noreply@isabelroses.com"; - - languages = [ "en" ]; - - registrations_open = false; - invites_enabled = true; - - admin_privileges = [ - "users_read" - "users_manage_invites" - "users_manage_activation_state" - "users_manage_tags" - "users_manage_credentials" - "users_delete" - "reports_manage_reports" - "moderation_log_read" - "statistics_read" - ]; - - federating = true; - - limit = 69420; - remote_limit = 100000; - max_pinned_statuses = 15; - max_account_fields = 100; - - upload_limit = 41943040; # 40Mb - - limit_to_local_content = mkRaw ":unauthenticated"; - healthcheck = true; - cleanup_attachments = true; - allow_relay = true; - safe_dm_mentions = true; - external_user_synchronization = true; - }; - - # going to setup prometheus later - ":prometheus"."Pleroma.Web.Endpoint.MetricsExporter" = { - enabled = true; - auth = false; - format = mkRaw ":text"; - path = "/api/pleroma/app_metrics"; - }; - - ":pleroma".":mrf".policies = map mkRaw [ "Pleroma.Web.ActivityPub.MRF.SimplePolicy" ]; - - # we configure from nix - ":pleroma".":configurable_from_database" = false; - - ":pleroma"."Pleroma.Captcha".enabled = false; - - ":pleroma".":mrf_simple".blocklist = builtins.mapAttrs (_: mkMap) (import ./blocklist.nix); - }; - - nginx = { - enableACME = true; - forceSSL = true; - quic = true; - }; - }; - - postgresql = { - ensureDatabases = [ "akkoma" ]; - ensureUsers = lib.singleton { - name = "akkoma"; - ensureDBOwnership = true; - }; - }; - }; - }; -} diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 6f1f7f44..256a8e9f 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -1,7 +1,6 @@ { imports = [ # keep-sorted start - ./akkoma ./anubis.nix ./arr.nix ./atuin.nix diff --git a/modules/nixos/services/gatus/me.nix b/modules/nixos/services/gatus/me.nix index e3b0b826..a13c49f5 100644 --- a/modules/nixos/services/gatus/me.nix +++ b/modules/nixos/services/gatus/me.nix @@ -57,11 +57,6 @@ } # social - { - name = "akkoma"; - group = "social"; - url = "https://akko.isabelroses.com/api/v1/instance"; - } { name = "matrix"; group = "social"; diff --git a/modules/nixos/system/earlyoom.nix b/modules/nixos/system/earlyoom.nix index a8f29c6f..1a8c13e1 100644 --- a/modules/nixos/system/earlyoom.nix +++ b/modules/nixos/system/earlyoom.nix @@ -27,7 +27,6 @@ let "zsh" "fish" "n?vim" - "akkoma" ]; prefer = concatStringsSep "|" [ diff --git a/systems/minerva/default.nix b/systems/minerva/default.nix index 9f1b0bac..78b60576 100644 --- a/systems/minerva/default.nix +++ b/systems/minerva/default.nix @@ -40,10 +40,8 @@ wakapi.enable = true; # social - akkoma.enable = true; nixpkgs-prs-bot = { enable = true; - fedi.enable = true; bsky.enable = true; }; matrix.enable = true;