diff --git a/os-mods/netdata/client.nix b/os-mods/netdata/client.nix
new file mode 100644
index 0000000..a22e9bd
--- /dev/null
+++ b/os-mods/netdata/client.nix
@@ -0,0 +1,58 @@
+{ config
+, lib
+, pkgs
+, modulesPath
+, system
+, inputs
+, ...
+}: {
+  services.netdata = {
+    enable = true;
+    package = pkgs.netdata;
+    python = {
+      enable = true;
+
+      extraPackages = ps: [
+        ps.psycopg2
+        ps.docker
+        ps.dnspython
+      ];
+    };
+
+    configDir = {
+      "stream.conf" = pkgs.writeText "stream.conf" ''
+        [stream]
+        enabled = yes
+        api key = 31de92c9-d863-4c39-af37-72a5c6e0796b
+        destination = 100.64.0.13:19999
+      '';
+    };
+    config = {
+      global = {
+        # uncomment to reduce memory to 32 MB
+        "page cache size" = 32;
+
+        # update interval
+        "update every" = 2;
+      };
+      db = {
+        "update every" = 2;
+        "storage tiers" = 3;
+        "dbengine multihost disk space MB" = 256;
+        "dbengine tier 1 multihost disk space MB" = 256;
+        "dbengine tier 2 multihost disk space MB" = 256;
+        "cleanup obsolete charts after secs" = 600;
+      };
+      plugins = {
+        "go.d" = "yes";
+      };
+      web = {
+        "mode" = "none";
+      };
+      ml = {
+        # enable machine learning
+        "enabled" = "no";
+      };
+    };
+  };
+}
diff --git a/systems/nixos-desk/default.nix b/systems/nixos-desk/default.nix
index 565bba1..18ec9a7 100644
--- a/systems/nixos-desk/default.nix
+++ b/systems/nixos-desk/default.nix
@@ -20,7 +20,7 @@
     ../../os-mods/desktop/audio.nix
     ../../os-mods/desktop/gaming.nix
     ../../os-mods/desktop/printing.nix
-    ../../os-mods/netdata
+    ../../os-mods/netdata/client.nix
     ../../os-mods/network
     ../../os-mods/virt
     ../../users
diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix
index 68b0268..91a2bd7 100644
--- a/systems/nixos-fw16/default.nix
+++ b/systems/nixos-fw16/default.nix
@@ -19,6 +19,7 @@
     ../../os-mods/desktop/audio.nix
     ../../os-mods/desktop/gaming.nix
     ../../os-mods/desktop/printing.nix
+    ../../os-mods/netdata/client.nix
     ../../os-mods/network
     # ../../os-mods/ryzenapu
     ../../os-mods/virt