diff --git a/hosts/default.nix b/hosts/default.nix
index 16a5f4f..198b282 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -181,7 +181,11 @@
           "hass-ssh-key".owner = "hass";
           # "matrix-registration-shared-secret".owner = "matrix-synapse";
           # "matrix-sliding-sync-secret".owner = "matrix-synapse";
-          "autistici-password".owner = "forgejo";
+          "autistici-password" = {
+            # FIXME terrible, should create a third ad-hoc group
+            owner = "grafana";
+            group = "forgejo";
+          };
           "garmin-collector-environment".owner = "garmin-collector";
         };
       };
diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix
index f86b986..a4fead7 100644
--- a/hosts/sisko/default.nix
+++ b/hosts/sisko/default.nix
@@ -120,7 +120,7 @@
   boot.tmp.cleanOnBoot = true;
 
   fileSystems."/mnt/hd" = {
-    device = "/dev/disk/by-id/ata-WDC_WD10EADS-22M2B0_WD-WCAV52709550-part1";
+    device = "/dev/disk/by-id/ata-WDC_WD5000AAKX-08U6AA0_WD-WCC2E5TR40FU-part1";
     fsType = "ext4";
     options = ["nofail"];
   };
diff --git a/modules/grafana/default.nix b/modules/grafana/default.nix
index 98624b8..33d93f7 100644
--- a/modules/grafana/default.nix
+++ b/modules/grafana/default.nix
@@ -14,6 +14,13 @@ in {
         admin_user = "andrea";
         admin_password = "$__file{${config.age.secrets.grafana-password.path}}";
       };
+      smtp = {
+        enabled = true;
+        host = "smtp.autistici.org:587";
+        user = "andrea.ciceri@autistici.org";
+        from_address = "andrea.ciceri@autistici.org";
+        password = "$__file{${config.age.secrets.autistici-password.path}}";
+      };
     };
   };
   environment.persistence."/persist".directories = [
diff --git a/modules/home-assistant/default.nix b/modules/home-assistant/default.nix
index e40f0ed..1ffe137 100644
--- a/modules/home-assistant/default.nix
+++ b/modules/home-assistant/default.nix
@@ -12,8 +12,8 @@
   pun_sensor = pkgs.fetchFromGitHub {
     owner = "virtualdj";
     repo = "pun_sensor";
-    rev = "19f270b353594ab536f9dc42adf31427e7a81562";
-    hash = "sha256-3pL+8CXzjmR54Ff9qLhHzC/C+uns0qWEgJFHv+K4MFs=";
+    rev = "51b216fab5c0d454d66060647c36e81bebfaf059";
+    hash = "sha256-bGVJx3bObXdf4AiC6bDvafs53NGS2aufRcTUmXy8nAI=";
   };
   cozy_life = pkgs.fetchFromGitHub {
     owner = "yangqian";
@@ -21,6 +21,12 @@
     rev = "9a40a2fa09b0f74aee0b278e2858f5600b3487a9";
     hash = "sha256-i+82EUamV1Fhwhb1vhRqn9aA9dJ0FxSSMD734domyhw=";
   };
+  garmin_connect = pkgs.fetchFromGitHub {
+    owner = "cyberjunky";
+    repo = "home-assistant-garmin_connect";
+    rev = "d42edcabc67ba6a7f960e849c8aaec1aabef87c0";
+    hash = "sha256-KqbP6TpH9B0/AjtsW5TcWSNgUhND+w8rO6X8fHqtsDI=";
+  };
   tuya-device-sharing-sdk = ps:
     ps.callPackage (
       {
@@ -102,6 +108,9 @@ in {
         holidays
         beautifulsoup4
         (tuya-device-sharing-sdk python3Packages) # remove after https://github.com/NixOS/nixpkgs/pull/294706/
+        getmac
+        garminconnect
+        tzlocal
       ];
     config = {
       default_config = {};
@@ -166,7 +175,8 @@ in {
 
   systemd.tmpfiles.rules = [
     "d ${config.services.home-assistant.configDir}/custom_components 770 hass hass"
-    "L+ ${config.services.home-assistant.configDir}/custom_components/pun_sensor - - - - ${pun_sensor}/custom_components/pun_sensor"
+    "C+ ${config.services.home-assistant.configDir}/custom_components/pun_sensor 770 hass hass - ${pun_sensor}/custom_components/pun_sensor"
+    "C+ ${config.services.home-assistant.configDir}/custom_components/garmin_connect 770 hass hass - ${garmin_connect}/custom_components/garmin_connect"
 
     "d ${config.services.home-assistant.configDir}/.ssh 770 hass hass"
     "C ${config.services.home-assistant.configDir}/.ssh/id_ed25519 700 hass hass - ${config.age.secrets.hass-ssh-key.path}"
diff --git a/modules/prometheus-exporters/default.nix b/modules/prometheus-exporters/default.nix
index a56d1cb..7a55821 100644
--- a/modules/prometheus-exporters/default.nix
+++ b/modules/prometheus-exporters/default.nix
@@ -49,7 +49,7 @@ in {
     nginx = mkFor ["sisko"] {
       enable = true;
     };
-    smartctl = mkFor ["sisko"] {
+    smartctl = mkFor ["sisko" "picard"] {
       enable = true;
     };
   };