aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2023-03-23 12:29:28 +0100
committerKarel Kočí <cynerd@email.cz>2023-03-23 12:29:28 +0100
commit28f1ed4a6a1cbf9b32904a010310e3da0f29b81b (patch)
tree173c0154bdef81449d910811ac354e8eed57be20 /nixos
parenta6ad2ec33705aae0a9fc99ffdd300ae5f68e2c6e (diff)
downloadnixos-personal-28f1ed4a6a1cbf9b32904a010310e3da0f29b81b.tar.gz
nixos-personal-28f1ed4a6a1cbf9b32904a010310e3da0f29b81b.tar.bz2
nixos-personal-28f1ed4a6a1cbf9b32904a010310e3da0f29b81b.zip
nixos/monitoring: fix invalid function and measure speed on dean
Diffstat (limited to 'nixos')
-rw-r--r--nixos/machine/dean.nix1
-rw-r--r--nixos/modules/monitoring.nix19
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";
+ }
+ ];
});
};
};