diff --git a/roles/server/caddy.nix b/roles/server/caddy.nix index 6542295..0f2edea 100644 --- a/roles/server/caddy.nix +++ b/roles/server/caddy.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let manualHostname = "manual.everest.tailscale"; @@ -32,14 +31,10 @@ in { virtualHosts = { nixos-manual = { hostName = manualHostname; - extraConfig = let - manual = pkgs.compressDrvWeb config.system.build.manual.manualHTML {}; - in '' + extraConfig = '' import tailscale - file_server { - precompressed zstd br gzip - } - root * ${manual}/share/doc/nixos + file_server + root * ${config.system.build.manual.manualHTML}/share/doc/nixos ''; }; downloads = { diff --git a/roles/server/forgejo.nix b/roles/server/forgejo.nix index 9a69380..d202b88 100644 --- a/roles/server/forgejo.nix +++ b/roles/server/forgejo.nix @@ -2,7 +2,6 @@ config, lib, flakeSelf, - pkgs, ... }: let hostSecrets = "${flakeSelf.inputs.secrets}/" + config.networking.hostName + "/"; @@ -25,7 +24,6 @@ in { specialisation.forgejoEnableRegistration.configuration.services.forgejo.settings.service.DISABLE_REGISTRATION = false; services.forgejo = { enable = true; - package = pkgs.forgejo; settings = { service = { DISABLE_REGISTRATION = lib.mkDefault true; @@ -43,9 +41,6 @@ in { DEFAULT_PUSH_CREATE_PRIVATE = true; DEFAULT_BRANCH = "main"; }; - indexer = { - REPO_INDEXER_ENABLED = true; - }; }; };