Update nixpkgs 2025-08-17-01-03

flake.lock

@@ -646,11 +646,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1756266583,
-        "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
+        "lastModified": 1755186698,
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
         "type": "github"
       },
       "original": {

hosts/dn42-il-gw1/configuration.nix

@@ -237,7 +237,7 @@
     ];
   };
 
-  services.bijwerken = {
+  clerie.system-auto-upgrade = {
     autoUpgrade = true;
   };
 

hosts/dn42-il-gw5/configuration.nix

@@ -111,7 +111,7 @@
     '';
   };
 
-  services.bijwerken = {
+  clerie.system-auto-upgrade = {
     autoUpgrade = true;
     startAt = "*-*-* 06:22:00";
   };

hosts/dn42-il-gw6/configuration.nix

@@ -105,7 +105,7 @@
     '';
   };
 
-  services.bijwerken = {
+  clerie.system-auto-upgrade = {
     autoUpgrade = true;
     startAt = "*-*-* 07:22:00";
   };

hosts/dn42-ildix-clerie/configuration.nix

@@ -161,7 +161,7 @@
   }
   '';
 
-  services.bijwerken = {
+  clerie.system-auto-upgrade = {
     autoUpgrade = true;
   };
 

hosts/dn42-ildix-service/configuration.nix

@@ -70,7 +70,7 @@
 
   networking.firewall.allowedTCPPorts = [ 80 443 ];
 
-  services.bijwerken = {
+  clerie.system-auto-upgrade = {
     autoUpgrade = true;
   };
 

hosts/monitoring-3/rules.yml

@@ -89,7 +89,7 @@ groups:
       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: 15m
+    for: 5m
     labels:
       severity: critical
     annotations:
@@ -102,11 +102,3 @@ groups:
     annotations:
       summary: "Too many notification requests failed"
       description: "Too many notification requests to Alertmanager integration {{ $labels.integration }} failed"
-  - alert: FemSocialDown
-    expr: min(probe_success{target="fem.social", job=~"blackbox_local_http.*"}) == 0
-    for: 5m
-    labels:
-      severity: critical
-    annotations:
-      summary: "fem.social unavailable via HTTP"
-      description: "fem.social is not fully reachable via HTTP"

hosts/nonat/configuration.nix

@@ -41,7 +41,7 @@
 
   networking.firewall.allowedUDPPorts = [];
 
-  services.bijwerken = {
+  clerie.system-auto-upgrade = {
     autoUpgrade = true;
   };
 

hosts/porter/configuration.nix

@@ -58,7 +58,7 @@
   networking.firewall.allowedTCPPorts = [ 80 443 ];
   networking.firewall.allowedUDPPorts = [];
 
-  services.bijwerken = {
+  clerie.system-auto-upgrade = {
     autoUpgrade = true;
   };
 

hosts/storage-2/configuration.nix

@@ -52,7 +52,7 @@
     };
   };
 
-  services.bijwerken = {
+  clerie.system-auto-upgrade = {
     autoUpgrade = true;
   };
 

modules/clerie-system-upgrade/default.nix

@@ -3,13 +3,13 @@
 with lib;
 
 let
-  cfg = config.services.bijwerken;
+  cfg = config.clerie.system-auto-upgrade;
 in
 
 {
   options = {
-    services.bijwerken = {
-      enable = mkEnableOption "Automatic system upgrades";
+    clerie.system-auto-upgrade = {
+      enable = mkEnableOption "clerie system upgrade";
       autoUpgrade = mkOption {
         type = types.bool;
         default = false;
@@ -20,15 +20,10 @@ in
         default = null;
         description = "Systemd time string for starting the unit";
       };
-      nodeExporterTextfilePath = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        description = "Path to node exporter textfile for putting metrics";
-      };
     };
   };
   config = mkIf cfg.enable {
-    systemd.services.bijwerken-system-upgrade = {
+    systemd.services.clerie-system-auto-upgrade = {
       requires = [ "network-online.target" ];
       after = [ "network-online.target" ];
 
@@ -38,10 +33,10 @@ in
 
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = (getExe pkgs.bijwerken-system-upgrade) + " --no-confirm${optionalString (cfg.nodeExporterTextfilePath != null) " --node-exporter-metrics-path ${cfg.nodeExporterTextfilePath}"}";
+        ExecStart = pkgs.clerie-system-upgrade + "/bin/clerie-system-upgrade --no-confirm${optionalString (config.clerie.monitoring.enable) " --node-exporter-metrics-path /var/lib/prometheus-node-exporter/textfiles/clerie-system-upgrade.prom"}";
       };
     };
-    systemd.timers.bijwerken-system-upgrade = mkIf cfg.autoUpgrade {
+    systemd.timers.clerie-system-auto-upgrade = mkIf cfg.autoUpgrade {
       wantedBy = [ "timers.target" ];
       timerConfig = {
         OnCalendar = if cfg.startAt == null then "*-*-* 05:37:00" else cfg.startAt;
@@ -51,7 +46,7 @@ in
       after = [ "network-online.target" ];
     };
     environment.systemPackages = with pkgs; [
-      bijwerken-system-upgrade
+      clerie-system-upgrade
     ];
   };
 }

modules/default.nix

@@ -5,9 +5,9 @@
     ./policyrouting
     ./akne
     ./backup
-    ./bijwerken
     ./clerie-firewall
     ./clerie-gc-dir
+    ./clerie-system-upgrade
     ./dhcpcd-prefixdelegation
     ./minecraft-server
     ./monitoring

modules/monitoring/default.nix

@@ -75,8 +75,6 @@ in
 
     systemd.services."prometheus-node-exporter".serviceConfig.RestrictAddressFamilies = [ "AF_NETLINK" ];
 
-    services.bijwerken.nodeExporterTextfilePath = "/var/lib/prometheus-node-exporter/textfiles/bijwerken-system-upgrade.prom";
-
     services.prometheus.exporters.bird = mkIf cfg.bird {
       enable = true;
     };

pkgs/bijwerken-poke/bijwerken-poke.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-TARGETS="$(nix --extra-experimental-features "nix-command flakes" eval --raw ".#nixosConfigurations" --apply "nixosConfigurations: builtins.concatStringsSep \"\\n\" (builtins.attrValues (builtins.mapAttrs (name: host: host.config.networking.fqdn) nixosConfigurations))")"
-
-pssh -h <(echo "${TARGETS}") -i -- sudo systemctl start bijwerken-system-upgrade.service --no-block

pkgs/bijwerken-poke/default.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.writeShellApplication {
-  name = "bijwerken-poke";
-  text = builtins.readFile ./bijwerken-poke.sh;
-  runtimeInputs = with pkgs; [
-    pssh
-  ];
-}
-

pkgs/clerie-system-upgrade/clerie-system-upgrade.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 
 pkgs.writeShellApplication {
-  name = "bijwerken-system-upgrade";
-  text = builtins.readFile ./bijwerken-system-upgrade.sh;
+  name = "clerie-system-upgrade";
+  text = builtins.readFile ./clerie-system-upgrade.sh;
   runtimeInputs = with pkgs; [
     curl
     jq

pkgs/clerie-system-upgrade/clerie-system-upgrade.sh

@@ -50,7 +50,7 @@ echo "Set as boot target"
 
 if [[ -n "$NODE_EXPORTER_METRICS_PATH" ]]; then
 	echo "Write monitoring check data"
-	echo "bijwerken_system_upgrade_last_check $(date +%s)" > "$NODE_EXPORTER_METRICS_PATH"
+	echo "clerie_system_upgrade_last_check $(date +%s)" > "$NODE_EXPORTER_METRICS_PATH"
 fi
 
 BOOTED_SYSTEM_KERNEL="$(readlink /run/booted-system/{initrd,kernel,kernel-modules})"

pkgs/overlay.nix

@@ -1,11 +1,10 @@
 final: prev: {
-  bijwerken-poke = final.callPackage ./bijwerken-poke {};
-  bijwerken-system-upgrade = final.callPackage ./bijwerken-system-upgrade {};
   clerie-backup = final.callPackage ./clerie-backup {};
   clerie-cleanup-branches = final.callPackage ./clerie-update-nixfiles/clerie-cleanup-branches.nix {};
   clerie-keys = final.callPackage ./clerie-keys {};
   clerie-ssh-known-hosts = final.callPackage ./clerie-ssh-known-hosts {};
   clerie-system-remote-install = final.callPackage ./clerie-system-remote-install {};
+  clerie-system-upgrade = final.callPackage ./clerie-system-upgrade/clerie-system-upgrade.nix {};
   clerie-merge-nixfiles-update = final.callPackage ./clerie-update-nixfiles/clerie-merge-nixfiles-update.nix {};
   clerie-sops = final.callPackage ./clerie-sops/clerie-sops.nix {};
   clerie-sops-config = final.callPackage ./clerie-sops/clerie-sops-config.nix {};

profiles/common-nix/default.nix

@@ -19,10 +19,10 @@ in {
 
     clerie.nixfiles.enable = true;
 
-    services.bijwerken.enable = true;
+    clerie.system-auto-upgrade.enable = true;
 
     nix.settings = {
-      trusted-users = [ "@wheel" ];
+      trusted-users = [ "@wheel" "@guests" ];
       auto-optimise-store = true;
       # Keep buildtime dependencies
       keep-outputs = true;