From 9573be2232e08af4decb7ef414e0aa8bbb35b1d9 Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@helcel>
Date: Sat, 6 Jun 2026 00:48:56 +0200
Subject: [PATCH] cleanup

---
 modules/nixos/tools/telegraf/default.nix |  6 +++---
 modules/shared/sops/mock.yaml            |  6 +++---
 modules/shared/syscfg/monitoring.nix     | 20 +++-----------------
 systems/sandbox/cfg.nix                  |  5 +----
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/modules/nixos/tools/telegraf/default.nix b/modules/nixos/tools/telegraf/default.nix
index 97211da..57c2b8c 100644
--- a/modules/nixos/tools/telegraf/default.nix
+++ b/modules/nixos/tools/telegraf/default.nix
@@ -86,9 +86,9 @@ let
   ];
   outputsConfig = lib.mkMerge [{
       outputs.influxdb_v3 = {
-        urls = cfg.outputs.urls;
-        token = cfg.outputs.token;
-        database = cfg.outputs.database or "telegraf";
+        urls = cfg.outputs;
+        token = "$INFLUX_TOKEN";#config.sops.secrets.telegraf.path;
+        database = "telegraf";
       };
     }
   ];
diff --git a/modules/shared/sops/mock.yaml b/modules/shared/sops/mock.yaml
index 8fe95e9..f02a4b1 100644
--- a/modules/shared/sops/mock.yaml
+++ b/modules/shared/sops/mock.yaml
@@ -8,7 +8,7 @@ sandbox_wg_priv: ENC[AES256_GCM,data:4trdnPhgjlUChATnNx9o3Q==,iv:3efDzVFVCqv6yCN
 sandbox_wg_pub: ENC[AES256_GCM,data:7L4SJdDMi5DZHpLfR6cs,iv:UULKRJvU0lktwmKGcIP/sRAZb0j2e0iL40o3DkSv/+U=,tag:irsolwnnfOjhYfiyanjxjw==,type:str]
 PGP_KEY: ENC[AES256_GCM,data:lwwHWksY+ea8D3z9,iv:/tOEukP7LiNhhdSw870vPeUGhN2lse2v1pZ5fJQglc0=,tag:225sf9GjXc8/NZgcXJIxZA==,type:str]
 wifi: ENC[AES256_GCM,data:Z+pbGAekk26GD3zg4TXVacP4Nrh93HPEMNcT0I1YaA==,iv:oiWZvnKvWmF/6cRZpCLsuf1uPJig6toNla5uT3t2kyM=,tag:iS3sq8JZsNUby9pSxYPw5g==,type:str]
-telegraf: ENC[AES256_GCM,data:8+2gwK7YKqr8Cp3rJEm6hqvsQP/ACYQcB8RibgXKJsGMd71v6b4bnHQ+YvKtngARTrV85XIl/hcRcI4q86bYyUwKosvk30pFvDj7aQlqabxWf7tVIkBmqMAVyMs=,iv:/VBZ5UwJETp8DHeO4K/l8Ia9NSVME+eMoIkaW+IKH9w=,tag:cTmoobolGr77fMFCVLYNsw==,type:str]
+telegraf: ENC[AES256_GCM,data:7W0XDpBxz7J4tng+wQ9Sj8eYFjwJz4IQTrpuX0z0ORqqLuvXVidvMmPXvXKum/7U4wVzZJR1/dCw+XBCBxDjPinGhKWVYuJzf7Vfc/fvvsNvyt50DpfKyvwYiyiH1ME4ve3ghbJNC2t3,iv:9Vt8eIgbbFtRPPmSz/CTw7wfh7qvd74FzdUPV/mPrIE=,tag:U1BlXAVZ00ox3L3VyBKwRQ==,type:str]
 sops:
     age:
         - enc: |
@@ -29,8 +29,8 @@ sops:
             bb3JkY44COUt6wp8TWzQ7gaPWOX5/Y5X4yGDLD6rLp+/+1t0bqTcYQ==
             -----END AGE ENCRYPTED FILE-----
           recipient: age1pf4auk6u2tmefuqpuc6mntr26cp4wcsmlhnn98arzxsp3753ruqsj0jqk3
-    lastmodified: "2026-06-05T22:46:31Z"
-    mac: ENC[AES256_GCM,data:+Kbdn+qEc5EZ7RACP7D8Jz4FJjUiAhRS9gLUkcwsIcJLygFcSag9WZjdgN/cXBiyBSHboLAPZXt5nTNFY1SyBWD0Zfb0buoZE9ABQMhJ3XlKJ5FmKkXbXvkiiDhrpCklXeE1K8RHGBfdovFhQwIFmmlN9OBxrcuslUu0SeoStWI=,iv:oI/v8GWAHEkJDhKmuHBlTnlhGSgST3rvHqig9Qy2bcw=,tag:7gu625ICO4FiHk4a3dddPQ==,type:str]
+    lastmodified: "2026-06-05T22:48:32Z"
+    mac: ENC[AES256_GCM,data:2+N6afdjYf56Og1qL5Rgs7nHo7kLCNXLz2P/xB250+MNVWelGTSJpw5jXx7MPujfLy8TvToJlno7m085FUWIqb4UWtSpChtV+LrmHocS+tT10usMko8kUkKCfuwY/WxDOc4j0W1tcZv8f98uwaLzEGY2bLY+smjro0YPuDqw8WQ=,iv:iq+NwMDM9R3s6MDhbkxmCsto6DRxi6amkngjgG5PRoI=,tag:MbYCar0okMwAkqMcSsMujA==,type:str]
     pgp:
         - created_at: "2026-06-05T22:45:24Z"
           enc: |-
diff --git a/modules/shared/syscfg/monitoring.nix b/modules/shared/syscfg/monitoring.nix
index c55ecd5..bef5dd5 100644
--- a/modules/shared/syscfg/monitoring.nix
+++ b/modules/shared/syscfg/monitoring.nix
@@ -27,23 +27,9 @@ with lib; {
       default = [ ];
     };
 
-    outputs = {
-      urls = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-      };
-      database = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-      };
-      token = mkOption {
-        type = types.str;
-        default = "$INFLUXDB_TOKEN";
-      };
-      secretName = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-      };
+    outputs = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
     };
 
     extraConfig = mkOption {
diff --git a/systems/sandbox/cfg.nix b/systems/sandbox/cfg.nix
index 301fe18..3ad34df 100644
--- a/systems/sandbox/cfg.nix
+++ b/systems/sandbox/cfg.nix
@@ -104,10 +104,7 @@
         "docker"
         "ping"
       ];
-      outputs = {
-        urls = [ "http://127.0.0.1:8181" ];
-        database = "main";
-        secretName = "INFLUX";
+      outputs = [ "http://127.0.0.1:8181" ];
       };
     };
   };