From 2bbe3b61d0a5b5fdca3225a2fa230a3ef84a7055 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Tue, 27 Dec 2022 22:57:05 +0100
Subject: [PATCH] mastodon: Fix CDN redirect path

---
 home/programs/nvim/plugins.nix | 4 ++--
 system/nixos/mastodon.nix      | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index 1101151..d413e09 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -116,8 +116,8 @@ rec {
     src = pkgs.fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "0cb637ca9f4389172933e5aba36387ab8430b6fb";
-      sha256 = "071plz2vnn6qsyf9738hvpdh1hd5q9pqzsyyw6hjsn8higz55kab";
+      rev = "fb36ed4c9e962d9fbfa608cd4a5d9313b1e8a8b1";
+      sha256 = "097mlnw5a0pzgx3xz11nqysa4drygfl0rm1sf6n5ik2vasllj7m8";
       fetchSubmodules = false;
     };
   });
diff --git a/system/nixos/mastodon.nix b/system/nixos/mastodon.nix
index c79fb84..827e066 100644
--- a/system/nixos/mastodon.nix
+++ b/system/nixos/mastodon.nix
@@ -106,7 +106,9 @@ in
       enableACME = false;
 
       locations."/system/" = {
-        return = "301 https://mastodon-cdn.kempkens.io$request_uri";
+        extraConfig = ''
+          rewrite ^/system/?(.*)$ https://mastodon-cdn.kempkens.io/$1 permanent;
+        '';
       };
 
       locations."/" = {