flake.lock

@@ -503,6 +503,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1764560356,
+        "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -618,19 +634,14 @@
         "nix-filter": [
           "nix-filter"
         ],
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nixpkgs"
-        ],
-        "treefmt-nix": [
-          "treefmt-nix"
-        ]
       },
       "locked": {
-        "lastModified": 1764875421,
+        "lastModified": 1757763404,
-        "narHash": "sha256-ZO9wiokPhropwsU3BfIgjm1bc59SIyqrfjfnFCM2Q68=",
+        "narHash": "sha256-a1h+58wDOtbQXrHoZwLwB7PhXwFhBXRHhNRhAQGq/oY=",
         "ref": "refs/heads/main",
-        "rev": "fa892558f123c5d5395663fa666466c73b997245",
+        "rev": "07a5fbca27ec941c841ad93f2ac65bc529225a51",
-        "revCount": 48,
+        "revCount": 46,
         "type": "git",
         "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"
       },
@@ -647,7 +658,7 @@
         "nix-filter": [
           "nix-filter"
         ],
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1757763091,

flake.nix

@@ -41,10 +41,10 @@
     servicepoint-cli = {
       url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
       inputs = {
-        nixpkgs.follows = "nixpkgs";
+        # TODO: update flake to 25.11
+        # nixpkgs.follows = "nixpkgs";
         naersk.follows = "naersk";
         nix-filter.follows = "nix-filter";
-        treefmt-nix.follows = "treefmt-nix";
       };
     };
     servicepoint-simulator = {
@@ -277,7 +277,6 @@
             self.nixosModules.globalinstalls
             self.nixosModules.lix-is-nix
             self.nixosModules.openssh
-            self.nixosModules.prometheus-node
             self.nixosModules.systemd-boot
             self.nixosModules.tailscale
             zerforschen-plus.nixosModules.default

nixosConfigurations/forgejo-runner-1/forgejo-runner.nix

@@ -8,7 +8,7 @@
     # https://wiki.nixos.org/wiki/Forgejo
 
     services.gitea-actions-runner = {
-      package = pkgs.forgejo-runner;
+      package = pkgs.forgejo-actions-runner;
       instances.default = {
         enable = true;
         name = "cccb";

nixosConfigurations/hetzner-vpn2/nginx.nix

@@ -2,7 +2,6 @@
 let
   blog-domain-socket = "/run/nginx/blog.sock";
   anubis-domain-socket = "/run/anubis/anubis-blog/anubis.sock";
-  anubis-metrics-socket = "/run/anubis/anubis-blog/anubis-metrics.sock";
 in
 {
   security.acme = {
@@ -27,9 +26,8 @@ in
         "zerforschen.plus" = {
           addSSL = true;
           enableACME = true;
-          locations = {
+          locations."/" = {
-            "/".proxyPass = "http://unix:" + anubis-domain-socket;
+            proxyPass = "http://unix:" + anubis-domain-socket;
-            "/_metrics".proxyPass = "http://unix:" + anubis-metrics-socket;
           };
         };
 
@@ -49,7 +47,6 @@ in
       settings = {
         BIND = anubis-domain-socket;
         TARGET = "unix://" + blog-domain-socket;
-        METRICS_BIND = anubis-metrics-socket;
       };
     };
   };

nixosModules/prometheus-node.nix

@@ -1,20 +0,0 @@
-{
-  services.prometheus.exporters = {
-    node = {
-      enable = true;
-      openFirewall = true;
-      port = 9190;
-      enabledCollectors = [
-        # keep-sorted start
-        "cgroups"
-        "interrupts"
-        "softirqs"
-        "swap"
-        "systemd"
-        "tcpstat"
-        "wifi"
-        # keep-sorted end
-      ];
-    };
-  };
-}