fi/nix-infra
1
2
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki 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 = [
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";

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

@ -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;

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

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

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

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

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

@ -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 = ''