From f0af00e1c22e40503b273003d37832bf0ea1462b Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Sat, 1 Mar 2025 21:11:37 +0100
Subject: [PATCH] theme works but not as default but urgh

---
 modules/fedi/akkoma-fe.nix | 12 ++++++++++--
 modules/fedi/config.json   |  4 ++++
 modules/fedi/default.nix   |  8 ++++----
 modules/fedi/rosepine.json |  5 +++--
 4 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 modules/fedi/config.json

diff --git a/modules/fedi/akkoma-fe.nix b/modules/fedi/akkoma-fe.nix
index 30b7763..9b2eb0f 100644
--- a/modules/fedi/akkoma-fe.nix
+++ b/modules/fedi/akkoma-fe.nix
@@ -2,13 +2,21 @@
   runCommand,
   akkoma-frontends,
   xorg,
+  jq,
 }:
-runCommand "akkoma-fe" {
-  nativeBuildInputs = [xorg.lndir];
+runCommand "akkoma_fe" {
+  nativeBuildInputs = [xorg.lndir jq];
 } ''
   mkdir $out
   lndir ${akkoma-frontends.akkoma-fe} $out
 
   rm $out/static/styles.json
   cp ${./styles.json} $out/static/styles.json
+
+  rm $out/static/config.json
+  jq -s add ${akkoma-frontends.akkoma-fe}/static/config.json ${./config.json} > $out/static/config.json
+
+  cp ${../../icons/favicon/favicon.png} $out/static/logo.png
+
+  cp ${./rosepine.json} $out/static/themes/rosepine.json
 ''
diff --git a/modules/fedi/config.json b/modules/fedi/config.json
new file mode 100644
index 0000000..95d646c
--- /dev/null
+++ b/modules/fedi/config.json
@@ -0,0 +1,4 @@
+{
+  "theme": "rosepine",
+  "logo": "/static/logo.png"
+}
diff --git a/modules/fedi/default.nix b/modules/fedi/default.nix
index 5354c02..cd7811f 100644
--- a/modules/fedi/default.nix
+++ b/modules/fedi/default.nix
@@ -14,13 +14,12 @@
   blobhaj = pkgs.callPackage ./blobhaj.nix {};
   blobhajFlags = pkgs.callPackage ./blobhajFlags.nix {};
   favicon = pkgs.callPackage ./favicon.nix {};
-  rosepine = pkgs.writeText "rosepine.json" ./rosepine.json;
 in
   mkIf conf.fedi.enable {
     services.akkoma = {
       enable = true;
       frontends.primary = {
-        name = "akkoma-fe";
+        name = "akkoma_fe";
         ref = "stable";
         package = akkoma-fe;
       };
@@ -35,7 +34,8 @@ in
 
           ":frontend_configurations" = {
             "akkoma_fe" = {
-              loog = "/static/favicon.png";
+              theme = "rosepine";
+              logo = "/static/logo.png";
             };
           };
 
@@ -132,7 +132,7 @@ in
         "emoji/blobhajFlags" = blobhajFlags;
 
         "static/favicon.png" = favicon;
-        "static/themes/rosepine" = rosepine;
+        "static/logo.png" = favicon;
         "favicon.png" = favicon;
       };
       nginx = {
diff --git a/modules/fedi/rosepine.json b/modules/fedi/rosepine.json
index 1886d40..a9acd2c 100644
--- a/modules/fedi/rosepine.json
+++ b/modules/fedi/rosepine.json
@@ -1,6 +1,7 @@
 {
   "_pleroma_theme_version": 2,
-  "theme": {
+  "name": "rosepine",
+  "source": {
     "themeEngineVersion": 3,
     "shadows": {
       "panel": [
@@ -563,4 +564,4 @@
       "attachment": "8"
     }
   }
-}
\ No newline at end of file
+}