From d619a245db6e7fd6441030d7c175b8b3344cb825 Mon Sep 17 00:00:00 2001 From: fi Date: Fri, 3 Jul 2026 19:33:12 +0200 Subject: [PATCH] Update NixOS 25.11 to 26.05 --- .../hosts/mail-1/simple-nixos-mailserver.nix | 21 +++++++++--- config/hosts/metrics/grafana.nix | 1 + config/hosts/nextcloud/nextcloud.nix | 2 +- .../containers/uptime-kuma/default.nix | 5 ++- .../virtualHosts/element-admin.nekover.se.nix | 8 ++--- flake.lock | 34 +++++++++---------- flake.nix | 4 +-- 7 files changed, 46 insertions(+), 29 deletions(-) diff --git a/config/hosts/mail-1/simple-nixos-mailserver.nix b/config/hosts/mail-1/simple-nixos-mailserver.nix index 0e8dba3..66b204a 100644 --- a/config/hosts/mail-1/simple-nixos-mailserver.nix +++ b/config/hosts/mail-1/simple-nixos-mailserver.nix @@ -1,4 +1,4 @@ -{ simple-nixos-mailserver, ... }: +{ simple-nixos-mailserver, config, ... }: { imports = [ simple-nixos-mailserver.nixosModule { @@ -11,9 +11,9 @@ enableImapSsl = true; enableSubmission = false; enableSubmissionSsl = true; - lmtpSaveToDetailMailbox = "no"; + lmtpSaveToDetailMailbox = false; domains = [ "grzb.de" "vs.grzb.de" "wg.grzb.de" "nekover.se" ]; - loginAccounts = { + accounts = { "fiona@grzb.de" = { hashedPasswordFile = "/run/secrets/mail-fiona-grzb-de"; aliases = [ "@grzb.de" ]; @@ -68,7 +68,8 @@ aliases = [ "nyareply@nekover.se" ]; }; }; - certificateScheme = "acme-nginx"; + # Reference the existing ACME configuration created by nginx + x509.useACMEHost = config.mailserver.fqdn; }; } ]; @@ -80,6 +81,18 @@ }; }; + # https://letsencrypt.org/repository/#let-s-encrypt-subscriber-agreement + security.acme.acceptTerms = true; + + # Allow incoming HTTP connections + networking.firewall.allowedTCPPorts = [ 80 ]; + + # Enable ACME HTTP-01 challenge with nginx + services.nginx = { + enable = true; + virtualHosts.${config.mailserver.fqdn}.enableACME = true; + }; + sops.secrets."mail-fiona-grzb-de" = { mode = "0440"; owner = "root"; diff --git a/config/hosts/metrics/grafana.nix b/config/hosts/metrics/grafana.nix index 05f80e3..54a1c00 100644 --- a/config/hosts/metrics/grafana.nix +++ b/config/hosts/metrics/grafana.nix @@ -13,6 +13,7 @@ admin_user = "yuri"; admin_password = "$__file{/run/secrets/metrics-grafana-admin-password}"; admin_email = "yuri@nekover.se"; + secret_key = "SW2YcwTIb9zpOOhoPsMm"; # default key }; smtp = { enabled = true; diff --git a/config/hosts/nextcloud/nextcloud.nix b/config/hosts/nextcloud/nextcloud.nix index 7c13bd4..db1dbf4 100644 --- a/config/hosts/nextcloud/nextcloud.nix +++ b/config/hosts/nextcloud/nextcloud.nix @@ -2,7 +2,7 @@ { services.nextcloud = { enable = true; - package = pkgs.nextcloud32; + package = pkgs.nextcloud33; hostName = "cloud.nekover.se"; https = true; config = { diff --git a/config/hosts/valkyrie/containers/uptime-kuma/default.nix b/config/hosts/valkyrie/containers/uptime-kuma/default.nix index 7f55ea4..4c10836 100644 --- a/config/hosts/valkyrie/containers/uptime-kuma/default.nix +++ b/config/hosts/valkyrie/containers/uptime-kuma/default.nix @@ -3,7 +3,10 @@ containers.uptime-kuma = { autoStart = true; config = { ... }: { - networking.useHostResolvConf = true; + networking = { + useHostResolvConf = true; + resolvconf.enable = false; + }; services.uptime-kuma = { enable = true; diff --git a/config/hosts/web-public-2/virtualHosts/element-admin.nekover.se.nix b/config/hosts/web-public-2/virtualHosts/element-admin.nekover.se.nix index cb8a45a..67cce4a 100644 --- a/config/hosts/web-public-2/virtualHosts/element-admin.nekover.se.nix +++ b/config/hosts/web-public-2/virtualHosts/element-admin.nekover.se.nix @@ -1,14 +1,14 @@ { config, pkgs, ... }: let - elementAdminVersion = "0.1.11"; + elementAdminVersion = "0.1.12"; elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: { pname = "element-admin"; version = elementAdminVersion; src = pkgs.fetchzip { url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip"; - sha256 = "sha256-tSUTDPspQJjvP1KN4nUr4LYyjNQFj4pKMMA8JmavIxo="; + sha256 = "sha256-+vm3oem3B9vEaWBc5I9huaEpgoajN74tJ1K5xt7U9n4="; }; nativeBuildInputs = [ @@ -18,8 +18,8 @@ let pnpmDeps = pkgs.pnpm.fetchDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-Hf4PWey5bczSNbc3QQ9z9X3OVUZ7VHXw7BHGQqJWPac="; + fetcherVersion = 3; + hash = "sha256-29clkcYO7xXX5c+cVpyaBIAo3Xyp5z4f13Lg3eWMZ9I="; }; buildPhase = '' diff --git a/flake.lock b/flake.lock index a889a2f..7f722fe 100644 --- a/flake.lock +++ b/flake.lock @@ -21,13 +21,13 @@ "locked": { "lastModified": 1767039857, "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1778507602, + "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", "type": "github" }, "original": { @@ -118,16 +118,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782841183, - "narHash": "sha256-Ndt/5R7UN4rBdhFR1lxHZZZ42cD6vGlnuxC2VvvsKE4=", + "lastModified": 1783047444, + "narHash": "sha256-9QKwAEv+CHoCAoWEXMwOLn3Oga3DU8W6mwhbpe1dBZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9bfd86ed684d27e63b0ff9ebb18699f84f27a3b", + "rev": "5a613bb3905713cfde9b3a6c24006a55bb8076eb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11-small", + "ref": "nixos-26.05-small", "repo": "nixpkgs", "type": "github" } @@ -166,16 +166,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1773831496, - "narHash": "sha256-JW2/QPyCVzmouqEp1H9kNa8JXd7xEhlam9sy3TYfhDY=", + "lastModified": 1779622335, + "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "826430a188181a750ffa5948daff334039c5d741", + "rev": "705e9929918b43bd7b715dc0a878ac870449bb03", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11-small", + "ref": "nixos-26.05-small", "repo": "nixpkgs", "type": "github" } @@ -198,16 +198,16 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1773912645, - "narHash": "sha256-QHzRqq6gh+t3F/QU9DkP7X63dDDcuIQmaDz12p7ANTg=", + "lastModified": 1781301671, + "narHash": "sha256-rq6WOopxq3U2AGEWO80o9LIJDYcYIdgw6jyl+y+19w8=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5", + "rev": "661ec59a97ccee13a63f79280b282eb6f7d3f817", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixos-mailserver", "type": "gitlab" } diff --git a/flake.nix b/flake.nix index 512ca5f..e46c988 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; }; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-26.05"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs";