From 5b5a142c71ee9a1826682809605aa1d4716d5ea0 Mon Sep 17 00:00:00 2001
From: noe <git@kat.cafe>
Date: Sun, 21 Apr 2024 12:36:37 -0400
Subject: [PATCH] s-e: add emotes via module

---
 flake.lock                              | 20 ++++++++++----------
 nixos/hosts/sapphic-engineer/akkoma.nix | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0dceb8a..088ebc6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713648847,
-        "narHash": "sha256-1nlurboQP8OH8ja4k4tH/l6ViJ49oehlA+xjxmzgV68=",
+        "lastModified": 1713717255,
+        "narHash": "sha256-AhLN3bEGhr0s04EeTy61Ypn9VxGj+Ij//XsHZWGu5xo=",
         "ref": "refs/heads/main",
-        "rev": "1518968e7bdb99376b08885a19fb08bd27d32861",
-        "revCount": 2,
+        "rev": "9fa081310c7c25804949e25ea9baf1c7d426cce1",
+        "revCount": 3,
         "type": "git",
         "url": "https://git.sapphic.engineer/noe/emotes"
       },
@@ -270,11 +270,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713682182,
-        "narHash": "sha256-2RSqVmQMFmn6OjQ21SXnWC+HuSeqDLWLftRv/ZhEDZE=",
+        "lastModified": 1713713092,
+        "narHash": "sha256-rvyr6BBtn3cq5B/48rhJlbIOpxprwlO/71663sd9Gik=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4cec20dbf5c0a716115745ae32531e34816ecbbe",
+        "rev": "2846d5230a3c3923618eabb367deaf8885df580f",
         "type": "github"
       },
       "original": {
@@ -456,11 +456,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1713710068,
-        "narHash": "sha256-/bVbflmdRdAmYOcv/daxtl2pG+d/F84SG9jD5047cGw=",
+        "lastModified": 1713717237,
+        "narHash": "sha256-St0SYEf2IRYkMBRS5B1yNAQSBeq+qeklYL0yRtrcUw4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "41992852aa6862dcd63681b0c0433be3818a8ea0",
+        "rev": "152632627e41222da0b9586e5339e748d846fc64",
         "type": "github"
       },
       "original": {
diff --git a/nixos/hosts/sapphic-engineer/akkoma.nix b/nixos/hosts/sapphic-engineer/akkoma.nix
index f7ea37c..f683919 100644
--- a/nixos/hosts/sapphic-engineer/akkoma.nix
+++ b/nixos/hosts/sapphic-engineer/akkoma.nix
@@ -9,6 +9,7 @@
 in {
   imports = [
     inputs.tachikoma.nixosModules.default
+    inputs.fedi-emotes.nixosModules.akkoma
   ];
 
   sops.secrets = secrets [
@@ -29,6 +30,15 @@ in {
 
     package = pkgs.master.akkoma;
 
+    emotes = {
+      enable = true;
+      emotePackages = with inputs.fedi-emotes.packages.${pkgs.system}; [
+        lightrunner-custom.hearts
+        lightrunner-custom.anime
+        pkgs.akkoma-emoji.blobs_gg
+      ];
+    };
+
     config = with (pkgs.formats.elixirConf { }).lib; {
       ":pleroma" =  {
         ":instance" = {
@@ -184,11 +194,6 @@ in {
       #     cp -r $src $out
       #   '';
       # };
-      "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
-      "emoji/hearts" = fediEmotes.lightrunner-custom.hearts;
-      "emoji/anime" = fediEmotes.lightrunner-custom.anime;
-      # "emoji/blobfox" = fediEmotes.volpeon.blobfox;
-      # "emoji/neocat" = fediEmotes.volpeon.neocat;
       "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" ''
         This is a private instance. Requests are not accepted.