simple impl of exposes thingy

nixos/hosts/olympus/default.nix

@@ -100,6 +100,12 @@
   "hedgedoc" = {
     ip = "10.42.42.23";
     mac = "86:BC:0C:18:BC:9B";
+    exposes = {
+      md = {
+        domain = "md.0x76.dev";
+        port = 3000;
+      };
+    };
   };
   "zmeura" = {
     ip = "10.42.42.24";

nixos/hosts/olympus/hedgedoc/configuration.nix

@@ -6,6 +6,7 @@
 let
   db_name = "hedgedoc";
   db_user = "hedgedoc";
+  inherit (config.meta.exposes.md) port;
   vs = config.vault-secrets.secrets;
 in {
   imports = [ ];
@@ -40,7 +41,7 @@ in {
     environmentFile = "${vs.hedgedoc}/environment";
     settings = {
       host = "0.0.0.0";
-      port = 3000;
+      inherit port;
       sessionSecret = "$SESSION_SECRET";
       domain = "md.0x76.dev";
       protocolUseSSL = true;

nixos/hosts/olympus/nginx/configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hosts, ... }:
 let
   proxy = url: {
     enableACME = true;
@@ -44,9 +44,11 @@ in {
 
     package = pkgs.nginxMainline;
 
+    # Templated
+    virtualHosts.${hosts.olympus.hedgedoc.exposes.md.domain} = proxy "http://hedgedoc.olympus:${toString hosts.olympus.hedgedoc.exposes.md.port}/";
+
     # 0x76.dev
     virtualHosts."ha.0x76.dev" = proxy "http://home-assistant.olympus:8123/";
-    virtualHosts."md.0x76.dev" = proxy "http://hedgedoc.olympus:3000/";
     virtualHosts."git.0x76.dev" = proxy "http://gitea.olympus:3000";
     virtualHosts."o.0x76.dev" = proxy "http://minio.olympus:9000";
     virtualHosts."grafana.0x76.dev" =

nixos/hosts/thalassa/aoife/configuration.nix

@@ -4,7 +4,6 @@
 
 { inputs, ... }: {
   imports = [
-    ../../../common/desktop
     ./hardware-configuration.nix
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-z
     ./hardware.nix
@@ -26,6 +25,8 @@
   # Enable Ozone rendering for Chromium and Electron apps.
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
+  # environment.sessionVariables.INFRA_INFO = self; # hosts.${config.networking.domain}.${config.networking.hostName};
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

nixos/hosts/thalassa/default.nix

@@ -1,5 +1,7 @@
 {
-  # "null" = { type = "local"; };
-  "aoife" = { type = "local"; };
+  "aoife" = {
+    type = "local";
+    mac = "04:7b:cb:b6:2d:88";
+  };
   "eevee" = { type = "local"; };
 }

nixos/hosts/thalassa/eevee/configuration.nix

@@ -3,8 +3,7 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { pkgs, inputs, ... }: {
-  imports =
-    [ ../../../common/desktop ./hardware-configuration.nix ./hardware.nix ];
+  imports = [ ./hardware-configuration.nix ./hardware.nix ];
 
   # Bootloader.
   boot = {