From afa708fa8df207948becd87ef013cf2bb5db106c Mon Sep 17 00:00:00 2001
From: RGBCube <git@rgbcu.be>
Date: Tue, 16 Jan 2024 12:16:40 +0300
Subject: [PATCH] Fix deprecation warnings

---
 hosts/cube/default.nix |  2 +-
 hosts/cube/grafana.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hosts/cube/default.nix b/hosts/cube/default.nix
index 64f5d13..0885e2d 100644
--- a/hosts/cube/default.nix
+++ b/hosts/cube/default.nix
@@ -8,7 +8,7 @@
 
   time.timeZone = "Europe/Amsterdam";
 
-  users.users.root.passwordFile = config.age.secrets."cube/password.hash.rgb".path;
+  users.users.root.hashedPasswordFile = config.age.secrets."cube/password.hash.rgb".path;
 
   users.users.rgb = normalUser {
     description                 = "RGB";
diff --git a/hosts/cube/grafana.nix b/hosts/cube/grafana.nix
index ea2dd64..382cf63 100644
--- a/hosts/cube/grafana.nix
+++ b/hosts/cube/grafana.nix
@@ -24,19 +24,19 @@ in serverSystemConfiguration {
   systemd.services.grafana.requires = [ "postgresql.service" ];
 
   services.grafana = enabled {
-    domain = fqdn;
-    port   = 8999;
-
-    analytics.reporting.enable = false;
-
     provision = enabled {};
 
     settings = {
+      analytics.reporting_enabled = false;
+
       database.host = "/run/postgresql";
       database.type = "postgres";
       database.user = "grafana";
 
-      server.http_addr    = "::";
+      server.domain    = fqdn;
+      server.http_addr = "::";
+      server.port      = 8999;
+
       users.default_theme = "system";
     };
 
@@ -69,7 +69,7 @@ in serverSystemConfiguration {
     useACMEHost = domain;
 
     locations."/" = {
-      proxyPass       = "http://[::]:${toString config.services.grafana.port}";
+      proxyPass       = "http://[::]:${toString config.services.grafana.settings.server.port}";
       proxyWebsockets = true;
     };
   };