diff --git a/hosts/hopper/profiles/lab/caddy.nix b/hosts/hopper/profiles/lab/caddy.nix index d549397..1466ebf 100644 --- a/hosts/hopper/profiles/lab/caddy.nix +++ b/hosts/hopper/profiles/lab/caddy.nix @@ -1,8 +1,6 @@ { config, vars, - inputs, - pkgs, ... }: let inherit (vars) domain; @@ -61,14 +59,6 @@ in { glances = mkPrivateEntry "glances" "${bridge}:${toString config.services.glances.port}"; alertmanager = mkPrivateEntry "alerts" "${bridge}:${toString config.services.prometheus.alertmanager.port}"; - base = { - hostName = "${domain}:80"; - extraConfig = '' - root * ${inputs.own-website.packages.${pkgs.system}.default} - file_server - ''; - }; - other = { hostName = "*.${domain}:80"; extraConfig = '' diff --git a/hosts/rackserv/profiles/caddy.nix b/hosts/rackserv/profiles/caddy.nix index 561ef96..d40eafb 100644 --- a/hosts/rackserv/profiles/caddy.nix +++ b/hosts/rackserv/profiles/caddy.nix @@ -1,6 +1,8 @@ { vars, config, + pkgs, + inputs, ... }: let inherit (vars) domain; @@ -36,14 +38,28 @@ in { virtualHosts = let forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT; in { - misc = { - hostName = "${domain}"; - serverAliases = ["*.${domain}"]; + hopper = { + hostName = ""; + serverAliases = [ + "navidrome.${domain}" + "vw.${domain}" + "abs.${domain}" + "rss.${domain}" + ]; useACMEHost = domain; + logFormat = "output file ${config.services.caddy.logDir}/access-hopper.log"; extraConfig = '' reverse_proxy ${hopper} ''; }; + base = { + hostName = "${domain}"; + useACMEHost = domain; + extraConfig = '' + root * ${inputs.own-website.packages.${pkgs.system}.default} + file_server + ''; + }; forgejo = { hostName = "git.${domain}"; useACMEHost = domain; diff --git a/sys/profiles/nix/gc.nix b/sys/profiles/nix/gc.nix index b7c88d1..73f2a68 100644 --- a/sys/profiles/nix/gc.nix +++ b/sys/profiles/nix/gc.nix @@ -8,14 +8,4 @@ options = "--delete-older-than 14d"; }; nix.optimise.automatic = true; - - systemd.services.remove-old-nix-gc-roots = let - beforeDate = "last month"; - in { - description = "Remove old nix gc roots"; - script = "exec ${lib.getExe pkgs.findutils} /nix/var/nix/gcroots/auto -not -newermt \"${beforeDate}\" -delete"; - serviceConfig.Type = "oneshot"; - before = ["nix-gc.service"]; - requiredBy = ["nix-gc.service"]; - }; } diff --git a/sys/profiles/nix/nix.nix b/sys/profiles/nix/nix.nix index adf3ab8..ceb613b 100644 --- a/sys/profiles/nix/nix.nix +++ b/sys/profiles/nix/nix.nix @@ -11,7 +11,6 @@ settings = { builders-use-substitutes = true; - keep-outputs = true; keep-derivations = true; accept-flake-config = true; use-xdg-base-directories = true;