machines/kitt.nix

@@ -9,6 +9,7 @@ Role:     LDAP Server
 Notes:
 */
 {
+  config,
   pkgs,
   lib,
   nodes,
@@ -25,6 +26,8 @@ in {
     ../applications/discord.nix
     ../applications/bitwarden/vaultwarden.nix
     ../applications/bitwarden/bitwarden_sync.nix
+    ../applications/grafana.nix
+    ../applications/prometheus.nix
   ];
 
   deployment = {
@@ -77,4 +80,27 @@ in {
       name = name;
     };
   };
+  services.skynet.prometheus = {
+    server = {
+      host = {
+        ip = ip_pub;
+        name = name;
+      };
+    };
+  };
+
+  services.skynet.grafana = {
+    enable = true;
+
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
+
+    # maybe just do provision config directly ?
+    datasource = {
+      name = "Prometheus";
+      url = "localhost:${toString config.services.prometheus.port}";
+    };
+  };
 }

machines/marvin.nix

@@ -26,8 +26,6 @@ Notes:
   groups_trusted = map (x: "@${x}") groups;
 in {
   imports = [
-    ../applications/grafana.nix
-    ../applications/prometheus.nix
   ];
 
   deployment = {
@@ -52,30 +50,6 @@ in {
     sudo_groups = groups;
   };
 
-  services.skynet.prometheus = {
-    server = {
-      host = {
-        ip = ip_pub;
-        name = name;
-      };
-    };
-  };
-
-  services.skynet.grafana = {
-    enable = true;
-
-    host = {
-      ip = ip_pub;
-      name = name;
-    };
-
-    # maybe just do provision config directly ?
-    datasource = {
-      name = "Prometheus";
-      url = "localhost:${toString config.services.prometheus.port}";
-    };
-  };
-
   skynet_dns.records = [
     {
       record = name;