From 58ed5acb9593c04e3213cc88742f7612b83dafc1 Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Tue, 29 Sep 2026 01:39:51 +0200
Subject: [PATCH] Upgrade to NixOS 26.05 (for all hosts)

---
 .../element-admin.hamburg.ccc.de.nix          |  4 ++--
 flake.lock                                    | 23 +++----------------
 flake.nix                                     |  7 +++---
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix
index 8ee4336..95ceeb7 100644
--- a/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix
+++ b/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix
@@ -18,8 +18,8 @@ let
 
     pnpmDeps = pkgs.pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
-      fetcherVersion = 2;
-      hash = "sha256-Hf4PWey5bczSNbc3QQ9z9X3OVUZ7VHXw7BHGQqJWPac=";
+      fetcherVersion = 4;
+      hash = "sha256-wUAzyx9QsdW2kT2tBX6HeZz20c0Hbz1HZjscb4NCz9E=";
     };
 
     buildPhase = ''
diff --git a/flake.lock b/flake.lock
index d3c87ea..04f7d9d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,27 +19,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1782847189,
-        "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
+        "lastModified": 1790533781,
+        "narHash": "sha256-F+b8u43BVF5DlM0pz7JQSbtbwKy5PrHIT5zQUekXsD0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-2605": {
-      "locked": {
-        "lastModified": 1789749394,
-        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
+        "rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442",
         "type": "github"
       },
       "original": {
@@ -69,7 +53,6 @@
       "inputs": {
         "authorizedKeysRepo": "authorizedKeysRepo",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-2605": "nixpkgs-2605",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix"
       }
diff --git a/flake.nix b/flake.nix
index f75f2d4..238204e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,9 +5,8 @@
     # Use the NixOS small channels for nixpkgs.
     # https://nixos.org/manual/nixos/stable/#sec-upgrading
     # https://github.com/NixOS/nixpkgs
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixpkgs-2605.url = "github:nixos/nixpkgs?ref=nixos-26.05";
 
     # # Add nixos-generators as an input.
     # # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake
@@ -29,7 +28,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2605, sops-nix, authorizedKeysRepo, ... }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }:
     let
       specialArgs = {
         inherit authorizedKeysRepo;
@@ -89,7 +88,7 @@
           ];
         };
 
-        git = nixpkgs-2605.lib.nixosSystem {
+        git = nixpkgs.lib.nixosSystem {
           inherit system specialArgs;
           modules = [
             self.nixosModules.common