From bcace9cdb9b47cc56e1a53b80ce2c249a416a735 Mon Sep 17 00:00:00 2001
From: noe <git@kat.cafe>
Date: Sat, 6 Apr 2024 14:59:57 -0400
Subject: [PATCH] ok yay

---
 .gitignore |  1 +
 flake.nix  | 14 +++++++++-----
 justfile   |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92b2793..2bbdbfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .direnv
+result
diff --git a/flake.nix b/flake.nix
index 0a14e61..60d20eb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,6 @@
     packages = forAllSystems (system: let 
       pkgs = nixpkgs.legacyPackages.${system};
       lib = pkgs.lib;
-      patchSet = dirPath: map (file: builtins.readFile ./${dirPath}/${file}) (builtins.filter (file: lib.strings.hasSuffix ".patch" file) (builtins.attrNames (builtins.readDir dirPath)));
     in rec {
       default = akkoma.tachikoma;
 
@@ -49,10 +48,12 @@
           domain = "akkoma.dev";
           owner = "AkkomaGang";
           repo = "akkoma";
-          hash = "sha256-MPUZFcIxZ21fe3edwi+/Kt8qpwNBCh40wheC3QMqw2M=";
+          hash = "sha256-eKvfuHTLmUU6Dom/GctPSbhrAAik1T/7bYY5j3YUkRo=";
         };
 
-        patches = patchSet ./akkoma;
+        patches = [
+          # none yet
+        ];
         patchFlags = "-p1 -F5";
       });
 
@@ -66,10 +67,13 @@
           domain = "akkoma.dev";
           owner = "AkkomaGang";
           repo = "akkoma-fe";
-          hash = "sha256-MPUZFcIxZ21fe3edwi+/Kt8qpwNBCh40wheC3QMqw2M=";
+          hash = "sha256-Z7psmIyOo8Rvwcip90JgxLhZ5SkkGB94QInEgm8UOjQ=";
         };
 
-        patches = patchSet ./akkoma-fe;
+        patches = [
+          ./akkoma-fe/0001-confirm-favorite.patch
+          ./akkoma-fe/0002-move-notifications.patch
+        ];
         patchFlags = "-p1 -F5";
       });
     });
diff --git a/justfile b/justfile
index 3ab381a..646681d 100644
--- a/justfile
+++ b/justfile
@@ -1,8 +1,8 @@
 default: build
 build: build-be build-fe
 
-build-fe:
+build-be:
 	nix build .#akkoma.tachikoma
 
-build-be:
+build-fe:
 	nix build .#akkoma-frontends.tachikoma-fe
\ No newline at end of file