feat(nixos/kanata): switch to new modules

1 files changed, 1 insertions, 25 deletions

diff --git a/modules/services/blocky/default.nix b/modules/services/blocky/default.nix
index 5afa4a8..81c517e 100644
--- a/modules/services/blocky/default.nix
+++ b/modules/services/blocky/default.nix
@@ -32,11 +32,6 @@ in
           ips = [ "9.9.9.9" "149.112.112.112" ];
         };
 
-        customDNS.mapping = {
-          "metrics.internal" = "100.93.1.1"; # kanata
-          "nextcloud.internal" = "100.93.1.1"; # kanata
-        };
-
         caching = {
           minTime = "0m";
           maxTime = "12h";
@@ -68,8 +63,6 @@ in
 
     services.prometheus = {
       enable = true;
-      listenAddress = "127.0.0.1";
-      port = 9000;
       globalConfig.scrape_interval = "15s";
       globalConfig.evaluation_interval = "15s";
       scrapeConfigs = [{
@@ -79,14 +72,7 @@ in
     };
 
     services.grafana = {
-      enable = true;
       settings = {
-        analytics.reporting_enabled = false;
-        server = {
-          domain = "127.0.0.1:3000";
-          http_addr = "127.0.0.1";
-          enable_gzip = true;
-        };
         # Required for blocky panel
         panels.disable_sanitize_html = true;
       };
@@ -99,7 +85,7 @@ in
             access = "proxy";
             orgId = 1;
             uid = "5Z0Y8D3GXAMDODSF";
-            url = "http://127.0.0.1:9000";
+            url = "http://127.0.0.1:${toString config.services.prometheus.port}";
             isDefault = true;
             jsonData = {
               graphiteVersion = "1.1";
@@ -116,16 +102,6 @@ in
       };
     };
 
-    services.nginx.virtualHosts."metrics.internal" = {
-      locations."/" = {
-        proxyPass = "http://localhost:3000";
-        proxyWebsockets = true;
-        extraConfig = ''
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        '';
-      };
-    };
-
     environment.etc."grafana-dashboards/blocky_rev3.json" = {
       source = ./grafana_blocky_rev3.json;
       group = "grafana";