diff --git a/flake.nix b/flake.nix index ac3d1d8b..a3856fe6 100644 --- a/flake.nix +++ b/flake.nix @@ -158,6 +158,7 @@ }; }; overlays = [ + self.overlays.cinny self.overlays.pyronet-packages self.overlays.nix-index self.overlays.sway-unwrapped diff --git a/overlays/cinny/default.nix b/overlays/cinny/default.nix index ea62084e..d18bd510 100644 --- a/overlays/cinny/default.nix +++ b/overlays/cinny/default.nix @@ -1,4 +1,4 @@ -_: prev: { +_: final: prev: { cinny-unwrapped = prev.cinny-unwrapped.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ ./nix-commands.patch ]; }); diff --git a/systems/x86_64-linux/prefect/services/caddy.nix b/systems/x86_64-linux/prefect/services/caddy.nix index 709855d7..c9c19db6 100644 --- a/systems/x86_64-linux/prefect/services/caddy.nix +++ b/systems/x86_64-linux/prefect/services/caddy.nix @@ -102,12 +102,12 @@ in { ${pns.matrix-server.extUrl} = { extraConfig = '' handle /_matrix/* { - reverse_proxy http://100.123.15.72:6922 + reverse_proxy http://${marvin}:${toString pns.matrix-server.port} } @nativeRouter not file {path} / handle { rewrite @nativeRouter {http.matchers.file.relative} - root * /var/www/cinny/dist + root * ${pkgs.cinny} file_server } '';