nixos: services: remove redundant subdomains

See previous commit for the defaults.

modules/nixos/services/blog/default.nix

@@ -5,7 +5,6 @@ let
   domain = config.networking.domain;
 
   makeHostInfo = subdomain: {
-    inherit subdomain;
     root = "/var/www/${subdomain}";
   };
 

modules/nixos/services/calibre-web/default.nix

@@ -42,7 +42,6 @@ in
 
     my.services.nginx.virtualHosts = {
       library = {
-        subdomain = "library";
         inherit (cfg) port;
       };
     };

modules/nixos/services/drone/server/default.nix

@@ -47,7 +47,6 @@ in
 
     my.services.nginx.virtualHosts = {
       drone = {
-        subdomain = "drone";
         inherit (cfg) port;
       };
     };

modules/nixos/services/flood/default.nix

@@ -42,7 +42,6 @@ in
 
     my.services.nginx.virtualHosts = {
       flood = {
-        subdomain = "flood";
         inherit (cfg) port;
       };
     };

modules/nixos/services/gitea/default.nix

@@ -119,12 +119,10 @@ in
     my.services.nginx.virtualHosts = {
       # Proxy to Gitea
       git = {
-        subdomain = "git";
         inherit (cfg) port;
       };
       # Redirect `gitea.` to actual forge subdomain
       gitea = {
-        subdomain = "gitea";
         redirect = config.services.gitea.settings.server.ROOT_URL;
       };
     };

modules/nixos/services/indexers/default.nix

@@ -30,7 +30,6 @@ in
 
       my.services.nginx.virtualHosts = {
         jackett = {
-          subdomain = "jackett";
           port = jackettPort;
         };
       };
@@ -43,7 +42,6 @@ in
 
       my.services.nginx.virtualHosts = {
         nzbhydra = {
-          subdomain = "nzbhydra";
           port = nzbhydraPort;
         };
       };
@@ -56,7 +54,6 @@ in
 
       my.services.nginx.virtualHosts = {
         prowlarr = {
-          subdomain = "prowlarr";
           port = prowlarrPort;
         };
       };

modules/nixos/services/jellyfin/default.nix

@@ -19,7 +19,6 @@ in
 
     my.services.nginx.virtualHosts = {
       jellyfin = {
-        subdomain = "jellyfin";
         port = 8096;
         extraConfig = {
           locations."/" = {

modules/nixos/services/lohr/default.nix

@@ -100,7 +100,6 @@ in
 
     my.services.nginx.virtualHosts = {
       lohr = {
-        subdomain = "lohr";
         inherit (cfg) port;
       };
     };

modules/nixos/services/matrix/default.nix

@@ -120,7 +120,6 @@ in
     my.services.nginx.virtualHosts = {
       # Element Web app deployment
       chat = {
-        subdomain = "chat";
         root = pkgs.element-web.override {
           conf = {
             default_server_config = {
@@ -148,16 +147,13 @@ in
       };
       # Dummy VHosts for port collision detection
       matrix-federation = {
-        subdomain = "matrix-federation";
         port = federationPort.private;
       };
       matrix-client = {
-        subdomain = "matrix-client";
         port = clientPort.private;
       };
       # Sliding sync
       matrix-sync = {
-        subdomain = "matrix-sync";
         inherit (cfg.slidingSync) port;
       };
     };

modules/nixos/services/miniflux/default.nix

@@ -45,7 +45,6 @@ in
 
     my.services.nginx.virtualHosts = {
       reader = {
-        subdomain = "reader";
         inherit (cfg) port;
       };
     };

modules/nixos/services/monitoring/default.nix

@@ -127,7 +127,6 @@ in
 
     my.services.nginx.virtualHosts = {
       monitoring = {
-        subdomain = "monitoring";
         inherit (cfg.grafana) port;
       };
     };

modules/nixos/services/navidrome/default.nix

@@ -49,7 +49,6 @@ in
 
     my.services.nginx.virtualHosts = {
       music = {
-        subdomain = "music";
         inherit (cfg) port;
       };
     };

modules/nixos/services/nginx/default.nix

@@ -404,7 +404,6 @@ in
 
     my.services.nginx.virtualHosts = {
       login = {
-        subdomain = "login";
         inherit (cfg.sso) port;
       };
     };

modules/nixos/services/nix-cache/default.nix

@@ -45,7 +45,6 @@ in
 
     my.services.nginx.virtualHosts = {
       cache = {
-        subdomain = "cache";
         inherit (cfg) port;
       };
     };

modules/nixos/services/paperless/default.nix

@@ -145,7 +145,6 @@ in
 
     my.services.nginx.virtualHosts = {
       paperless = {
-        subdomain = "paperless";
         inherit (cfg) port;
         sso = {
           enable = true;

modules/nixos/services/pirate/default.nix

@@ -23,7 +23,6 @@ let
   mkRedirection = service: {
     my.services.nginx.virtualHosts = {
       ${service} = {
-        subdomain = service;
         port = ports.${service};
       };
     };

modules/nixos/services/podgrab/default.nix

@@ -33,7 +33,6 @@ in
 
     my.services.nginx.virtualHosts = {
       podgrab = {
-        subdomain = "podgrab";
         inherit (cfg) port;
       };
     };

modules/nixos/services/sabnzbd/default.nix

@@ -20,7 +20,6 @@ in
 
     my.services.nginx.virtualHosts = {
       sabnzbd = {
-        subdomain = "sabnzbd";
         inherit port;
       };
     };

modules/nixos/services/tandoor-recipes/default.nix

@@ -72,7 +72,6 @@ in
 
     my.services.nginx.virtualHosts = {
       recipes = {
-        subdomain = "recipes";
         inherit (cfg) port;
       };
     };

modules/nixos/services/transmission/default.nix

@@ -82,7 +82,6 @@ in
     # seems to have stalled
     my.services.nginx.virtualHosts = {
       transmission = {
-        subdomain = "transmission";
         inherit (cfg) port;
       };
     };

modules/nixos/services/vikunja/default.nix

@@ -60,8 +60,7 @@ in
 
     # This is a weird setup
     my.services.nginx.virtualHosts = {
-      vikunja = {
+      ${subdomain} = {
-        inherit subdomain;
         # Serve the root for the web-ui
         root = config.services.vikunja.package-frontend;
 

modules/nixos/services/woodpecker/server/default.nix

@@ -54,12 +54,10 @@ in
 
     my.services.nginx.virtualHosts = {
       woodpecker = {
-        subdomain = "woodpecker";
         inherit (cfg) port;
       };
       # I might want to be able to RPC from other hosts in the future
       woodpecker-rpc = {
-        subdomain = "woodpecker-rpc";
         port = cfg.rpcPort;
       };
     };