nixos/monitoring: fix invalid function and measure speed on dean

2 files changed, 12 insertions, 8 deletions

diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix
index 8fca4bf..4d35a9d 100644
--- a/nixos/machine/dean.nix
+++ b/nixos/machine/dean.nix
@@ -10,6 +10,7 @@ with lib; {
       openvpn = {
         oldpersonal = true;
       };
+      monitoring.speedtest = true;
     };
 
     networking = {
diff --git a/nixos/modules/monitoring.nix b/nixos/modules/monitoring.nix
index e08ae14..7a9e7b7 100644
--- a/nixos/modules/monitoring.nix
+++ b/nixos/modules/monitoring.nix
@@ -92,14 +92,17 @@ in {
                 }
               ];
               wireless = [{}];
-            }) // (optionaAttrs cnf.speedtest {
-              exec = [{
-                commands = ["${pkgs.speedtest-cli}/bin/speedtest --json"];
-                name_override = "speedtest";
-                timeout = "5m";
-                interval = "15m";
-                data_format = "json";
-              }];
+            })
+            // (optionalAttrs cnf.speedtest {
+              exec = [
+                {
+                  commands = ["${pkgs.speedtest-cli}/bin/speedtest --json"];
+                  name_override = "speedtest";
+                  timeout = "5m";
+                  interval = "15m";
+                  data_format = "json";
+                }
+              ];
             });
         };
       };