6 files changed, 78 insertions, 25 deletions
diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix
index db2f6c2..2bc3fab 100644
--- a/hosts/apocalypse/default.nix
+++ b/hosts/apocalypse/default.nix
@@ -19,6 +19,10 @@
     HandleLidSwitchDocked = "ignore";
   };
 
+  wilkuu.mjmap = {
+    enable = true; 
+    # users = ["wilkuu"];
+  };  
   ## Addons for this system
   addons = {
     desktop.hyprland.enable = false;
diff --git a/hosts/omega-relay/certs.nix b/hosts/omega-relay/certs.nix
index affa18e..079d201 100644
--- a/hosts/omega-relay/certs.nix
+++ b/hosts/omega-relay/certs.nix
@@ -1,18 +1,18 @@
-{pkgs, config, lib, ...}: 
-  let 
-    names = [
-      "moni.wilkuu.xyz"
-      "matrix.wilkuu.xyz"
-      "rss.wilkuu.xyz" 
-      "bulwark.wilkuu.xyz"
-      "uptime.wilkuu.xyz"
-      "bitwarden.wilkuu.xyz"
-      "wilkuu.xyz"
-    ];
-    in
+{ lib, ... }:
+let
+  names = [
+    "moni.wilkuu.xyz"
+    "matrix.wilkuu.xyz"
+    "rss.wilkuu.xyz"
+    "bulwark.wilkuu.xyz"
+    "uptime.wilkuu.xyz"
+    "bitwarden.wilkuu.xyz"
+    "wilkuu.xyz"
+  ];
+in
 {
-  services.nginx.virtualHosts = lib.genAttrs names (name: {
-    enableACME = lib.mkForce false; 
+  services.nginx.virtualHosts = lib.genAttrs names (_name: {
+    enableACME = lib.mkForce false;
     useACMEHost = "wilkuu.xyz";
-  }); 
-} 
+  });
+}
diff --git a/hosts/omega-relay/default.nix b/hosts/omega-relay/default.nix
index 181add4..cd0e9dc 100644
--- a/hosts/omega-relay/default.nix
+++ b/hosts/omega-relay/default.nix
@@ -178,12 +178,41 @@
       virtualHosts."moni.wilkuu.xyz" = {
         forceSSL = true;
         enableACME = false;
-        useACMEHost = "wilkuu.xyz";  
+        useACMEHost = "wilkuu.xyz";
         locations."/" = {
           proxyPass = "http://192.168.88.5:3132";
           recommendedProxySettings = true;
         };
       };
+      virtualHosts."fin.wilkuu.xyz" = {
+        forceSSL = true;
+        enableACME = false;
+        useACMEHost = "wilkuu.xyz";
+        locations."/" = {
+          proxyPass = "http://192.168.88.5:80";
+          recommendedProxySettings = true;
+        };
+      };
+      virtualHosts."fin-imp.wilkuu.xyz" = {
+        forceSSL = true;
+        enableACME = false;
+        useACMEHost = "wilkuu.xyz";
+        locations."/" = {
+          proxyPass = "http://192.168.88.5:80";
+          recommendedProxySettings = true;
+        };
+      };
+      virtualHosts."kb.wilkuu.xyz" = {
+        forceSSL = true;
+        enableACME = false;
+        useACMEHost = "wilkuu.xyz";
+        locations."/" = {
+          proxyPass = "http://192.168.88.5:80";
+          recommendedProxySettings = true;
+        };
+      };
+
+
     };
 
   networking.hostName = "omega-relay";
diff --git a/hosts/omega-relay/firewall.nix b/hosts/omega-relay/firewall.nix
index 4bbc77a..0e82fea 100644
--- a/hosts/omega-relay/firewall.nix
+++ b/hosts/omega-relay/firewall.nix
@@ -79,7 +79,7 @@ in
             ];
             presharedKeyFile = config.sops.secrets."wg/home/chrono/PSK".path;
             publicKey = "rP5lJY6ea7BKX40edzqNMJbhfLkSlSwG1FipEufeflk=";
-            endpoint       = "45.138.54.155:16556";
+            endpoint = "45.138.54.155:16556";
             # endpoint = "wilkuu.duckdns.org:16556";
             name = "wg-home-chronosphere";
             persistentKeepalive = 5;
diff --git a/hosts/tacitus/default.nix b/hosts/tacitus/default.nix
index 50d5542..fa39daa 100644
--- a/hosts/tacitus/default.nix
+++ b/hosts/tacitus/default.nix
@@ -8,11 +8,30 @@
     ./network.nix
     ./disko.nix
     ./hardware.nix
+    ./../../services/mysql.nix
+    ./../../services/kanboard.nix
+    ./../../services/firefly_iii.nix
   ];
 
+  wilkuu.mjmap = {
+    enable = true; 
+    users = ["wilkuu"];
+  };  
   wilkuu.services = {
     prometheus.enableScraper = true;
     prometheus.enableExporters = true;
+    test_endpoint.enable = false; 
+    mysql.enable = true;
+    kanboard = {
+      enable = true; 
+      domain = "kb.wilkuu.xyz";
+    };
+    firefly-iii = {
+      enable = true;
+      enable-importer = true;
+      domain = "fin.wilkuu.xyz";
+      importer-domain = "fin-imp.wilkuu.xyz";
+    };
   };
 
   addons = {
@@ -82,7 +101,7 @@
 
   sops.templates."prometheus-mikrotik-config" = {
     owner = "mikrotik-exporter";
-    content = lib.generators.toYAML {} {
+    content = lib.generators.toYAML { } {
       devices = [
         {
           name = "chronosphere";
@@ -100,15 +119,15 @@
       ];
       features = {
         dhcp = true;
-        dhcpv6 = true; 
+        dhcpv6 = true;
         optics = true;
         health = true;
         poe = true;
-        wlansta = true;
-        wlanif = true;
-        monitor=true;
-        routes = true; 
-        firware = true; 
+        wlansta = false;
+        wlanif =  false;
+        monitor = true;
+        routes = true;
+        firware = true;
         netwatch = true;
         conntrack = true;
       };
diff --git a/hosts/tacitus/network.nix b/hosts/tacitus/network.nix
index df48a9b..2409ba1 100644
--- a/hosts/tacitus/network.nix
+++ b/hosts/tacitus/network.nix
@@ -8,6 +8,7 @@ let
     443
     config.services.grafana.settings.server.http_port
     config.services.prometheus.port
+    config.services.mysql.settings.mysqld.port 
   ]
   ++ lib.mapAttrsToList (_: opt: opt.port) (
     lib.filterAttrs (