diff --git a/flake.lock b/flake.lock index 2107834..7baf43a 100644 --- a/flake.lock +++ b/flake.lock @@ -661,11 +661,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1679758258, - "narHash": "sha256-/fsleSIKfnCCzrn4MIAEDTCKeCe+ZxXEPrKykAI5q08=", + "lastModified": 1679786039, + "narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d80bf24dab1c1abb3c36e6e28cd30d27599a9620", + "rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727", "type": "github" }, "original": { @@ -1006,11 +1006,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1679598117, - "narHash": "sha256-Vs1f/7imI77OkMOQhO3xgx4jalN2Gx3D3C2wmnlpWJM=", + "lastModified": 1679944521, + "narHash": "sha256-SipdMlnCv/pDvo/j7ctEGqKvQSmn2gcoHSJgIVysXbk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "648021dcb2b65498eed3ea3a7339cdfc3bea4d82", + "rev": "82ecc5b88ffed8c0317c064dfd8f82f4b9882100", "type": "github" }, "original": { @@ -1166,11 +1166,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1679163677, - "narHash": "sha256-VC0tc3EjJZFPXgucFQAYMIHce5nJWYR0kVCk4TVg6gg=", + "lastModified": 1679748960, + "narHash": "sha256-BP8XcYHyj1NxQi04RpyNW8e7KiXSoI+Fy1tXIK2GfdA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3912035d00ef755ab19394488b41feab95d2e40", + "rev": "da26ae9f6ce2c9ab380c0f394488892616fc5a6a", "type": "github" }, "original": { @@ -1293,11 +1293,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1679734080, - "narHash": "sha256-z846xfGLlon6t9lqUzlNtBOmsgQLQIZvR6Lt2dImk1M=", + "lastModified": 1679793451, + "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dbf5322e93bcc6cfc52268367a8ad21c09d76fea", + "rev": "0cd51a933d91078775b300cf0f29aa3495231aa2", "type": "github" }, "original": { @@ -1392,11 +1392,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1679377997, - "narHash": "sha256-O8rmc/b/qgNgoHj2tL5+3Ovkj7A+Sok7gazRoWbpnqg=", + "lastModified": 1679799335, + "narHash": "sha256-YrnDyftm0Mk4JLuw3sDBPNfSjk054N0dqQx8FW4JqDM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d8827a8368c307fbc6ed594c9a31d619e7360bed", + "rev": "4740f80ca6e756915aaaa0a9c5fbb61ba09cc145", "type": "github" }, "original": { diff --git a/hosts/plato/configuration.nix b/hosts/plato/configuration.nix index 3700914..2d44c2d 100644 --- a/hosts/plato/configuration.nix +++ b/hosts/plato/configuration.nix @@ -11,7 +11,6 @@ ../../modules/gitea ../../modules/matrix ../../modules/minecraft - ../../modules/pleroma ../../modules/postgresql ../../modules/sops ../../modules/traefik diff --git a/modules/akkoma/default.nix b/modules/akkoma/default.nix index b20562f..46391f6 100644 --- a/modules/akkoma/default.nix +++ b/modules/akkoma/default.nix @@ -62,6 +62,7 @@ in postgresqlBackup = { enable = true; + databases = [ "akkoma" ]; }; }; diff --git a/modules/pleroma/config.exs b/modules/pleroma/config.exs deleted file mode 100644 index 2b8fffb..0000000 --- a/modules/pleroma/config.exs +++ /dev/null @@ -1,67 +0,0 @@ -import Config - -config :pleroma, Pleroma.Web.Endpoint, - url: [host: "walkah.social", scheme: "https", port: 443], - http: [ip: {0, 0, 0, 0}, port: 4000] - -config :pleroma, :instance, - name: "walkah.social", - email: "walkah@walkah.net", - notify_email: "walkah@walkah.net", - limit: 5000, - registrations_open: false - -config :pleroma, :media_proxy, - enabled: false, - redirect_on_failure: true - -config :pleroma, Pleroma.Repo, - adapter: Ecto.Adapters.Postgres, - username: "pleroma", - database: "pleroma", - hostname: "localhost" - -# Configure web push notifications -config :web_push_encryption, :vapid_details, subject: "mailto:walkah@walkah.net" - -config :pleroma, :database, rum_enabled: false -config :pleroma, :instance, - description: "Personal instance for James Walker. Running pleroma on NixOS", - static_dir: "/var/lib/pleroma/static" - -config :pleroma, :shout, - enabled: false - -config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" -config :pleroma, configurable_from_database: true - -config :pleroma, :frontend_configurations, - pleroma_fe: %{ - alwaysShowSubjectInput: true, - background: "", - collapseMessageWithSubject: false, - disableChat: false, - greentext: false, - hideFilteredStatuses: false, - hideMutedPosts: false, - hidePostStats: false, - hideSitename: false, - hideUserStats: false, - loginMethod: "password", - logo: "/static/logo.svg", - logoMargin: ".1em", - logoMask: true, - minimalScopesMode: false, - noAttachmentLinks: false, - nsfwCensorImage: "", - postContentType: "text/plain", - redirectRootLogin: "/main/friends", - redirectRootNoLogin: "/walkah", - scopeCopy: true, - sidebarRight: true, - showFeaturesPanel: false, - showInstanceSpecificPanel: false, - subjectLineBehavior: "email", - theme: "pleroma-dark", - webPushNotifications: false - } diff --git a/modules/pleroma/default.nix b/modules/pleroma/default.nix deleted file mode 100644 index b6d24cb..0000000 --- a/modules/pleroma/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -_: - -{ - services = { - pleroma = { - enable = true; - secretConfigFile = "/var/lib/pleroma/secrets.exs"; - configs = [ - (builtins.readFile ./config.exs) - ]; - }; - postgresql = { - ensureDatabases = [ "pleroma" ]; - ensureUsers = [{ - name = "pleroma"; - ensurePermissions = { "DATABASE pleroma" = "ALL PRIVILEGES"; }; - }]; - }; - postgresqlBackup.databases = [ "pleroma" ]; - }; -} diff --git a/modules/pleroma/nginx.nix b/modules/pleroma/nginx.nix deleted file mode 100644 index f02ad46..0000000 --- a/modules/pleroma/nginx.nix +++ /dev/null @@ -1,17 +0,0 @@ -_: - -{ - services.nginx = { - enable = true; - virtualHosts = { - "walkah.social" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://100.111.208.75:4000"; - proxyWebsockets = true; - }; - }; - }; - }; -}