From a7950d2466a587aaaae05ac616b35d5df259130b Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 2 Jun 2025 18:04:25 +0200
Subject: [PATCH 1/5] pkgs/overrides: Deactivate notification sounds in dino

---
 pkgs/overrides/dino.nix | 7 +++++++
 pkgs/pkgs.nix           | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 pkgs/overrides/dino.nix

diff --git a/pkgs/overrides/dino.nix b/pkgs/overrides/dino.nix
new file mode 100644
index 0000000..6df1285
--- /dev/null
+++ b/pkgs/overrides/dino.nix
@@ -0,0 +1,7 @@
+final: prev:
+prev.dino.overrideAttrs (finalAttrs: prevAttrs: {
+  mesonFlags = prevAttrs.mesonFlags ++ [
+    (final.lib.mesonEnable "plugin-notification-sound" false)
+  ];
+})
+
diff --git a/pkgs/pkgs.nix b/pkgs/pkgs.nix
index ac6b08a..8e2c444 100644
--- a/pkgs/pkgs.nix
+++ b/pkgs/pkgs.nix
@@ -27,5 +27,6 @@
   update-from-hydra = final: prev: final.callPackage ./update-from-hydra {};
   uptimestatus = final: prev: final.python3.pkgs.callPackage ./uptimestatus {};
 
+  dino = final: prev: import ./overrides/dino.nix final prev;
   xmppc = final: prev: import ./overrides/xmppc.nix final prev;
 }

From 89a96632a253b42709ffe816a6d1b096c059a736 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 2 Jun 2025 18:16:33 +0200
Subject: [PATCH 2/5] pkgs/overrides: Disable openpgp support in dino

---
 pkgs/overrides/dino.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/overrides/dino.nix b/pkgs/overrides/dino.nix
index 6df1285..0952ada 100644
--- a/pkgs/overrides/dino.nix
+++ b/pkgs/overrides/dino.nix
@@ -1,6 +1,7 @@
 final: prev:
 prev.dino.overrideAttrs (finalAttrs: prevAttrs: {
   mesonFlags = prevAttrs.mesonFlags ++ [
+    (final.lib.mesonEnable "plugin-openpgp" false)
     (final.lib.mesonEnable "plugin-notification-sound" false)
   ];
 })

From 3b0986cc57a6d1f72af85d6609e1cdb266b122b6 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 2 Jun 2025 18:30:35 +0200
Subject: [PATCH 3/5] modules/nginx-port-forward: Hardcode dns response caching
 time to 30s

---
 modules/nginx-port-forward/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx-port-forward/default.nix b/modules/nginx-port-forward/default.nix
index 7a13859..014543f 100644
--- a/modules/nginx-port-forward/default.nix
+++ b/modules/nginx-port-forward/default.nix
@@ -9,7 +9,7 @@ let
 
   mkServerBlock = isUDP: port: forward: ''
     server {
-      resolver 127.0.0.53 ipv4=off;
+      resolver 127.0.0.53 ipv4=off valid=30s;
 
       listen ${port}${optionalString isUDP " udp"}${optionalString (forward.certName != null) " ssl"};
       listen [::]:${port}${optionalString isUDP " udp"}${optionalString (forward.certName != null) " ssl"};

From c97799b97c6e4e5ae530f45d19b024c39b24ce4e Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 2 Jun 2025 18:46:43 +0200
Subject: [PATCH 4/5] hosts/monitoring-3: Alert on broken IPv4 to IPv6 proxy

---
 hosts/monitoring-3/rules.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hosts/monitoring-3/rules.yml b/hosts/monitoring-3/rules.yml
index 2493b04..bb0f5c9 100644
--- a/hosts/monitoring-3/rules.yml
+++ b/hosts/monitoring-3/rules.yml
@@ -87,3 +87,11 @@ groups:
     annotations:
       summary: "GPG {{ $labels.fingerprint }} is expiring soon"
       description: "GPG with fingerprint {{ $labels.fingerprint }} is expiring in less then six weeks"
+  - alert: NadjaTopIPv4ProxyBroken
+    expr: probe_success{job="blackbox_local_http6", target="blog.nadja.top"} != on (target) probe_success{job="blackbox_local_http4", target="blog.nadja.top"}
+    for: 5m
+    labels:
+      severity: critical
+    annotations:
+      summary: "blog.nadja.top unreachable via IPv4"
+      description: "blog.nadja.top unreachable IPv4, but reachable via IPv6"

From beb5c981ebc0b3ca8aec0e2e1283de5b791e5638 Mon Sep 17 00:00:00 2001
From: Flake Update Bot <flake-update-bot@clerie.de>
Date: Tue, 3 Jun 2025 03:03:04 +0200
Subject: [PATCH 5/5] Update nixpkgs 2025-06-03-01-03

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index a198352..a04f96d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -566,11 +566,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1748190013,
-        "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=",
+        "lastModified": 1748693115,
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62b852f6c6742134ade1abdd2a21685fd617a291",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
         "type": "github"
       },
       "original": {