diff --git a/modules/caddy/default.nix b/modules/caddy/default.nix index e76e49f..2516f39 100644 --- a/modules/caddy/default.nix +++ b/modules/caddy/default.nix @@ -8,10 +8,10 @@ services.tailscale.permitCertUid = "caddy"; services.caddy = let - catppuccin = builtins.fromJSON (builtins.readFile (fetchurl { + catppuccin = builtins.fromJSON (builtins.readFile (pkgs.fetchurl { url = "https://raw.githubusercontent.com/catppuccin/element/main/config.json"; - hash = "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB="; - })) + hash = "sha256-9y113raGhCKlKAPmi5MXEW64qpPJ9u2oN/kwR5etZo0="; + })); element = pkgs.element-web.override { conf = { @@ -20,6 +20,7 @@ "server_name" = "broccoli.town"; }; } // catppuccin; + }; in { enable = true; virtualHosts = { @@ -62,16 +63,7 @@ X-Content-Type-Options "nosniff" X-Robots-Tag "noindex, noarchive, nofollow" } - root * ${ - pkgs.element-web.override { - conf = { - default_server_config."m.homeserver" = { - "base_url" = "https://broccoli.town"; - "server_name" = "broccoli.town"; - }; - }; - } - } + root * ${element} file_server ''; };