diff --git a/hosts/srv-monitor/default.nix b/hosts/srv-monitor/default.nix
index 9f154e8..fdcc542 100644
--- a/hosts/srv-monitor/default.nix
+++ b/hosts/srv-monitor/default.nix
@@ -56,6 +56,11 @@
         grafana = {
           enable = true;
           domain = "grafana.${tailscaleDomain}";
+          datasources = {
+            victoriametrics.enable = true;
+            victorialogs.enable = true;
+          };
+          dashboards.node-exporter-full.enable = true;
         };
 
         victoriametrics = {
diff --git a/modules/system/services/grafana.nix b/modules/system/services/grafana.nix
deleted file mode 100644
index 239842f..0000000
--- a/modules/system/services/grafana.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.custom.services.grafana;
-in
-{
-  options.custom.services.grafana = {
-    enable = lib.mkEnableOption "";
-    domain = lib.mkOption {
-      type = lib.types.nonEmptyStr;
-      default = "";
-    };
-    port = lib.mkOption {
-      type = lib.types.port;
-      default = 3000;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    meta = {
-      domains.list = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
-    };
-
-    sops.secrets."grafana/admin-password" = {
-      owner = config.users.users.grafana.name;
-      restartUnits = [ "grafana.service" ];
-    };
-
-    services.grafana = {
-      enable = true;
-      settings = {
-        server = {
-          inherit (cfg) domain;
-          http_port = cfg.port;
-          enforce_domain = true;
-          enable_gzip = true;
-        };
-        security.admin_password = "$__file{${config.sops.secrets."grafana/admin-password".path}}";
-        users.default_theme = "system";
-        analytics.reporting_enabled = false;
-      };
-    };
-  };
-}
diff --git a/modules/system/services/grafana/default.nix b/modules/system/services/grafana/default.nix
new file mode 100644
index 0000000..977653c
--- /dev/null
+++ b/modules/system/services/grafana/default.nix
@@ -0,0 +1,126 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.custom.services.grafana;
+in
+{
+  options.custom.services.grafana = {
+    enable = lib.mkEnableOption "";
+    domain = lib.mkOption {
+      type = lib.types.nonEmptyStr;
+      default = "";
+    };
+    port = lib.mkOption {
+      type = lib.types.port;
+      default = 3000;
+    };
+    datasources = {
+      victoriametrics = {
+        enable = lib.mkEnableOption "";
+        url = lib.mkOption {
+          type = lib.types.nonEmptyStr;
+          default = "https://metrics.${config.custom.services.tailscale.domain}";
+        };
+      };
+      victorialogs = {
+        enable = lib.mkEnableOption "";
+        url = lib.mkOption {
+          type = lib.types.nonEmptyStr;
+          default = "https://logs.${config.custom.services.tailscale.domain}";
+        };
+      };
+    };
+    dashboards.node-exporter-full.enable = lib.mkEnableOption "";
+  };
+
+  config = lib.mkIf cfg.enable {
+    meta = {
+      domains.list = [ cfg.domain ];
+      ports.tcp.list = [ cfg.port ];
+    };
+
+    sops.secrets."grafana/admin-password" = {
+      owner = config.users.users.grafana.name;
+      restartUnits = [ "grafana.service" ];
+    };
+
+    services.grafana = {
+      enable = true;
+
+      settings = {
+        server = {
+          inherit (cfg) domain;
+          http_port = cfg.port;
+          enforce_domain = true;
+          enable_gzip = true;
+        };
+        security.admin_password = "$__file{${config.sops.secrets."grafana/admin-password".path}}";
+        users.default_theme = "system";
+        analytics.reporting_enabled = false;
+      };
+
+      provision = {
+        enable = true;
+
+        dashboards.settings = {
+          # TODO: Uncomment when upgrading to 25.11
+          # prune = true;
+          providers = [
+            {
+              name = "Dashboards";
+              disableDeletion = true;
+              options = {
+                path = "/etc/grafana-dashboards";
+                foldersFromFilesStructure = true;
+              };
+            }
+          ];
+        };
+
+        datasources.settings = {
+          # TODO: Uncomment when upgrading to 25.11
+          # prune = true;
+          datasources =
+            (lib.optional cfg.datasources.victoriametrics.enable {
+              name = "VictoriaMetrics";
+              type = "victoriametrics-metrics-datasource";
+              access = "proxy";
+              url = "https://metrics.${config.custom.services.tailscale.domain}";
+              isDefault = true;
+            })
+            ++ (lib.optional cfg.datasources.victorialogs.enable {
+              name = "VictoriaLogs";
+              type = "victoriametrics-logs-datasource";
+              access = "proxy";
+              url = "https://logs.${config.custom.services.tailscale.domain}";
+              isDefault = false;
+            });
+        };
+      };
+
+      declarativePlugins =
+        with pkgs.grafanaPlugins;
+        (lib.optional cfg.datasources.victoriametrics.enable victoriametrics-metrics-datasource)
+        ++ (lib.optional cfg.datasources.victorialogs.enable victoriametrics-logs-datasource);
+    };
+
+    environment.etc."grafana-dashboards/node-exporter-full.json".source =
+      lib.mkIf cfg.dashboards.node-exporter-full.enable
+        (
+          pkgs.fetchurl {
+            name = "node-exporter-full.json";
+            url = "https://grafana.com/api/dashboards/1860/revisions/41/download";
+            hash = "sha256-A6/4QjcMzkry68fSPwNdHq8i6SGwaKwZXVKDZB5h71A=";
+            downloadToTemp = true;
+            postFetch = ''
+              patch $downloadedFile < ${./patches/node-exporter-full.patch}
+              mv $downloadedFile $out
+            '';
+          }
+        );
+  };
+}
diff --git a/modules/system/services/grafana/patches/node-exporter-full.patch b/modules/system/services/grafana/patches/node-exporter-full.patch
new file mode 100644
index 0000000..446005b
--- /dev/null
+++ b/modules/system/services/grafana/patches/node-exporter-full.patch
@@ -0,0 +1,11 @@
+--- v1.json	2025-06-27 15:13:02.187282992 -0600
++++ v2.json	2025-06-27 15:12:49.094889325 -0600
+@@ -16015,7 +16015,7 @@
+         "label": "Datasource",
+         "name": "DS_PROMETHEUS",
+         "options": [],
+-        "query": "prometheus",
++        "query": "victoriametrics-metrics-datasource",
+         "refresh": 1,
+         "regex": "",
+         "type": "datasource"
\ No newline at end of file