From 474062d21350817d86f3eef0bdb4bfa2dcdbac88 Mon Sep 17 00:00:00 2001
From: "Rory&::Emma" <root@rory.gay>
Date: Mon, 13 Jan 2025 13:15:36 +0000
Subject: Update synapse, change some monitoring stuff, remove no-aaaa
 resolvconf option to fix grapevine

---
 modules/base.nix              | 2 +-
 modules/monitoring/system.nix | 2 +-
 modules/users/Rory.nix        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/base.nix b/modules/base.nix
index 2f565e4..b56f33e 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -78,7 +78,7 @@
   environment.etc."resolv.conf" = lib.mkDefault {
     text = lib.concatStringsSep "\n" (
       lib.optionals (config.networking ? nameservers) (map (nameserver: "nameserver ${nameserver}") (config.networking.nameservers))
-      ++ lib.optionals (config.networking ? enableIPv6 && !config.networking.enableIPv6) [ "options no-aaaa" ]
+      #++ lib.optionals (config.networking ? enableIPv6 && !config.networking.enableIPv6) [ "options no-aaaa" ]
       ++ lib.optionals (config.networking ? enableIPv6 && config.networking.enableIPv6) [
         "options single-request"
         "options single-request-reopen"
diff --git a/modules/monitoring/system.nix b/modules/monitoring/system.nix
index 171a7af..34f35c4 100644
--- a/modules/monitoring/system.nix
+++ b/modules/monitoring/system.nix
@@ -49,7 +49,7 @@ in
     services.prometheus.scrapeConfigs = [
       {
         job_name = "node";
-        scrape_interval = "${toString cfg.prometheusScrapeInterval}s";
+        scrape_interval = "5s";
         static_configs = [ { targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; } ];
       }
     ];
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index a1007fc..dd8b2d1 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -14,7 +14,7 @@
       git
       lsd
       duf
-      (btop.override { rocmSupport = true; })
+      btop
       htop
       kitty.terminfo
       tmux
-- 
cgit 1.5.1