From 16f158898f988205d26993027fef1750f6ed663a Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Sun, 29 Dec 2024 10:06:13 -0500
Subject: [PATCH] Remove pixelfed and photoprism

---
 modules/system/secrets/default.nix            | Bin 1986 -> 1791 bytes
 .../system/services/server/mysql/default.nix  |   7 ----
 .../system/services/server/social/default.nix |   5 ++-
 .../server/social/pixelfed/default.nix        |  32 ------------------
 4 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 modules/system/services/server/social/pixelfed/default.nix

diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix
index 1cbcd891b21536d4e0ab6093f52a8b702ce32d52..70933ecadc21f4a057f835d068833cd8949fdda7 100644
GIT binary patch
literal 1791
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
VM@{*{mwe}I2VVQ1R+VtE0RUX$dLaM+

literal 1986
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
WH(bc2;DkWPZ+~YG>pKygjrIVQ@#@$B

diff --git a/modules/system/services/server/mysql/default.nix b/modules/system/services/server/mysql/default.nix
index 1513b2b1..ffb208c8 100644
--- a/modules/system/services/server/mysql/default.nix
+++ b/modules/system/services/server/mysql/default.nix
@@ -6,7 +6,6 @@
     dataDir = "/var/lib/mysql";
     ensureDatabases = [
       "minecraft"
-      "photoprism"
     ];
     ensureUsers = [
       {
@@ -15,12 +14,6 @@
           "minecraft.*" = "ALL PRIVILEGES";
         };
       }
-      {
-        name = "photoprism";
-        ensurePermissions = {
-          "photoprism.*" = "ALL PRIVILEGES";
-        };
-      }
     ];
   };
 }
diff --git a/modules/system/services/server/social/default.nix b/modules/system/services/server/social/default.nix
index 7177cce1..678a2e03 100644
--- a/modules/system/services/server/social/default.nix
+++ b/modules/system/services/server/social/default.nix
@@ -1,10 +1,9 @@
 { ... }:
 {
   imports = [
-    ./matrix
-    ./mastodon
     ./lemmy
-    ./pixelfed
+    ./mastodon
+    ./matrix
     ./owncast
   ];
 }
diff --git a/modules/system/services/server/social/pixelfed/default.nix b/modules/system/services/server/social/pixelfed/default.nix
deleted file mode 100644
index d53d3711..00000000
--- a/modules/system/services/server/social/pixelfed/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, config, ... }:
-{
-  services.pixelfed = {
-    enable = true;
-    domain = "pics.${config.domains.jim1}";
-    secretFile = pkgs.writeText "appkey" config.secrets.pixelfedKey;
-    settings = {
-      APP_NAME = ''"Jimbo's Pixelfed"'';
-      INSTANCE_DESCRIPTION = ''"The Jimbosfiles Pixelfed Instance"'';
-      INSTANCE_CONTACT_EMAIL = "contact@${config.domains.jim2}";
-      OPEN_REGISTRATION = true;
-      APP_LOCALE = "en";
-      INSTANCE_DISCOVER_PUBLIC = true;
-      STORIES_ENABLED = true;
-
-      # Mail config
-      ENFORCE_EMAIL_VERIFICATION = true;
-      MAIL_FROM_ADDRESS = "noreply@${config.domains.jim1}";
-      MAIL_FROM_NAME = ''"Jimbo's Pixelfed <noreply@${config.domains.jim1}>"'';
-      MAIL_ENCRYPTION = "tls";
-      MAIL_DRIVER = "smtp";
-      MAIL_HOST = "mx.${config.domains.jim1}";
-      MAIL_PORT = 587;
-      MAIL_USERNAME = "noreply@${config.domains.jim1}";
-      MAIL_PASSWORD = config.secrets.noreplyPassword;
-    };
-    nginx = {
-      enableACME = true;
-      forceSSL = true;
-    };
-  };
-}