june/fi-nix-infra
1
0
Fork 0
forked from fi/nix-infra
Code Pull requests Activity

Update NixOS 25.11 to 26.05

Browse source
This commit is contained in:
fi 2026-07-03 19:33:12 +02:00
commit d619a245db
Signed by: fi
SSH key fingerprint: SHA256:dgX1HRsK+8F1OzYvKfv1VLhMJac/Iv/rsjixuV94+dA
7 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
config/hosts/mail-1/simple-nixos-mailserver.nix
View file

@ -1,4 +1,4 @@
{ simple-nixos-mailserver, ... }: { simple-nixos-mailserver, config, ... }:
{ {
imports = [ imports = [
simple-nixos-mailserver.nixosModule { simple-nixos-mailserver.nixosModule {
@ -11,9 +11,9 @@
enableImapSsl = true; enableImapSsl = true;
enableSubmission = false; enableSubmission = false;
enableSubmissionSsl = true; enableSubmissionSsl = true;
lmtpSaveToDetailMailbox = "no"; lmtpSaveToDetailMailbox = false;
domains = [ "grzb.de" "vs.grzb.de" "wg.grzb.de" "nekover.se" ]; domains = [ "grzb.de" "vs.grzb.de" "wg.grzb.de" "nekover.se" ];
loginAccounts = { accounts = {
"fiona@grzb.de" = { "fiona@grzb.de" = {
hashedPasswordFile = "/run/secrets/mail-fiona-grzb-de"; hashedPasswordFile = "/run/secrets/mail-fiona-grzb-de";
aliases = [ "@grzb.de" ]; aliases = [ "@grzb.de" ];
@ -68,7 +68,8 @@
aliases = [ "nyareply@nekover.se" ]; 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" = { sops.secrets."mail-fiona-grzb-de" = {
mode = "0440"; mode = "0440";
owner = "root"; owner = "root";

1
config/hosts/metrics/grafana.nix
View file

@ -13,6 +13,7 @@
admin_user = "yuri"; admin_user = "yuri";
admin_password = "$__file{/run/secrets/metrics-grafana-admin-password}"; admin_password = "$__file{/run/secrets/metrics-grafana-admin-password}";
admin_email = "yuri@nekover.se"; admin_email = "yuri@nekover.se";
secret_key = "SW2YcwTIb9zpOOhoPsMm"; # default key
}; };
smtp = { smtp = {
enabled = true; enabled = true;

2
config/hosts/nextcloud/nextcloud.nix
View file

@ -2,7 +2,7 @@
{ {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud32; package = pkgs.nextcloud33;
hostName = "cloud.nekover.se"; hostName = "cloud.nekover.se";
https = true; https = true;
config = { config = {

5
config/hosts/valkyrie/containers/uptime-kuma/default.nix
View file

@ -3,7 +3,10 @@
containers.uptime-kuma = { containers.uptime-kuma = {
autoStart = true; autoStart = true;
config = { ... }: { config = { ... }: {
networking.useHostResolvConf = true; networking = {
useHostResolvConf = true;
resolvconf.enable = false;
};
services.uptime-kuma = { services.uptime-kuma = {
enable = true; enable = true;

8
config/hosts/web-public-2/virtualHosts/element-admin.nekover.se.nix
View file

@ -1,14 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
elementAdminVersion = "0.1.11"; elementAdminVersion = "0.1.12";
elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: { elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "element-admin"; pname = "element-admin";
version = elementAdminVersion; version = elementAdminVersion;
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip"; url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip";
sha256 = "sha256-tSUTDPspQJjvP1KN4nUr4LYyjNQFj4pKMMA8JmavIxo="; sha256 = "sha256-+vm3oem3B9vEaWBc5I9huaEpgoajN74tJ1K5xt7U9n4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -18,8 +18,8 @@ let
pnpmDeps = pkgs.pnpm.fetchDeps { pnpmDeps = pkgs.pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
fetcherVersion = 2; fetcherVersion = 3;
hash = "sha256-Hf4PWey5bczSNbc3QQ9z9X3OVUZ7VHXw7BHGQqJWPac="; hash = "sha256-29clkcYO7xXX5c+cVpyaBIAo3Xyp5z4f13Lg3eWMZ9I=";
}; };
buildPhase = '' buildPhase = ''

34
flake.lock generated
View file

@ -21,13 +21,13 @@
"locked": { "locked": {
"lastModified": 1767039857, "lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra", "owner": "NixOS",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "edolstra", "owner": "NixOS",
"repo": "flake-compat", "repo": "flake-compat",
"type": "github" "type": "github"
} }
@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772893680, "lastModified": 1778507602,
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,16 +118,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1782841183, "lastModified": 1783047444,
"narHash": "sha256-Ndt/5R7UN4rBdhFR1lxHZZZ42cD6vGlnuxC2VvvsKE4=", "narHash": "sha256-9QKwAEv+CHoCAoWEXMwOLn3Oga3DU8W6mwhbpe1dBZ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c9bfd86ed684d27e63b0ff9ebb18699f84f27a3b", "rev": "5a613bb3905713cfde9b3a6c24006a55bb8076eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11-small", "ref": "nixos-26.05-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -166,16 +166,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1773831496, "lastModified": 1779622335,
"narHash": "sha256-JW2/QPyCVzmouqEp1H9kNa8JXd7xEhlam9sy3TYfhDY=", "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "826430a188181a750ffa5948daff334039c5d741", "rev": "705e9929918b43bd7b715dc0a878ac870449bb03",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11-small", "ref": "nixos-26.05-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -198,16 +198,16 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1773912645, "lastModified": 1781301671,
"narHash": "sha256-QHzRqq6gh+t3F/QU9DkP7X63dDDcuIQmaDz12p7ANTg=", "narHash": "sha256-rq6WOopxq3U2AGEWO80o9LIJDYcYIdgw6jyl+y+19w8=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5", "rev": "661ec59a97ccee13a63f79280b282eb6f7d3f817",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }

4
flake.nix
View file

@ -1,13 +1,13 @@
{ {
inputs = { 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-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-master.url = "github:NixOS/nixpkgs/master";
nixos-generators = { nixos-generators = {
url = "github:nix-community/nixos-generators"; url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs"; 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 = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";