diff --git a/config/hosts/mail-1/simple-nixos-mailserver.nix b/config/hosts/mail-1/simple-nixos-mailserver.nix index 66b204a..0e8dba3 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, config, ... }: +{ simple-nixos-mailserver, ... }: { imports = [ simple-nixos-mailserver.nixosModule { @@ -11,9 +11,9 @@ enableImapSsl = true; enableSubmission = false; enableSubmissionSsl = true; - lmtpSaveToDetailMailbox = false; + lmtpSaveToDetailMailbox = "no"; domains = [ "grzb.de" "vs.grzb.de" "wg.grzb.de" "nekover.se" ]; - accounts = { + loginAccounts = { "fiona@grzb.de" = { hashedPasswordFile = "/run/secrets/mail-fiona-grzb-de"; aliases = [ "@grzb.de" ]; @@ -68,8 +68,7 @@ aliases = [ "nyareply@nekover.se" ]; }; }; - # Reference the existing ACME configuration created by nginx - x509.useACMEHost = config.mailserver.fqdn; + certificateScheme = "acme-nginx"; }; } ]; @@ -81,18 +80,6 @@ }; }; - # 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/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 79a3841..f7913f0 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -1,29 +1,29 @@ { pkgs, nixpkgs-unstable, nixpkgs-master, ... }: let tangerineUI = pkgs.fetchgit { - url = "https://github.com/mattbirchler/Tangerine-Neue-for-Mastodon.git"; - rev = "2.6.4"; - hash = "sha256-yNzG7GWliWcXin1CbiQvu4euLAJ8x+r09zBWudey+84="; + url = "https://github.com/nileane/TangerineUI-for-Mastodon.git"; + rev = "v2.5.3"; + hash = "sha256-fs/pwIwXZvSNVmlSG304CMT/hSW/RtrzraMsrhg/TbE="; }; mastodonModern = pkgs.fetchgit { url = "https://git.gay/freeplay/Mastodon-Modern.git"; - rev = "3fd4700f68b34485c6056eab9852c1910d0c73d1"; - hash = "sha256-EqGlqw1M8FM/HlhQTeRGxUgAAgo6BOCdRTvWmOpkwnY="; + rev = "f899b68740e25e17ed600e38657d0ef94c92b293"; + hash = "sha256-+HQ7+Ypv540qB7ACfROJs8JUuqvMzaveKOdBsAfr3D4="; }; mastodonNekoversePatches = pkgs.fetchgit { url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git"; - hash = "sha256-R9YWjJYcPxFQk1eS85jVcYLolez8M828TSwp0AeplLc="; + hash = "sha256-NtdJWMi8/siduX2iFD+GAsK9J+Y6T/tZ/fXqb/QH284="; }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.6.2"; + version = "4.5.11"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-RA9yGmWyzwiD/skPxOB27hqRxMqKGFmMMDOvHR5FjqI="; + sha256 = "sha256-YAWlge8dShDFfMBhyRQHryZUs1yD5KNKzXOyCpRsy9w="; }; # mastodon ships with broken symlinks, disable the check for that for now dontCheckForBrokenSymlinks = true; diff --git a/config/hosts/metrics/grafana.nix b/config/hosts/metrics/grafana.nix index 54a1c00..05f80e3 100644 --- a/config/hosts/metrics/grafana.nix +++ b/config/hosts/metrics/grafana.nix @@ -13,7 +13,6 @@ 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 db1dbf4..7c13bd4 100644 --- a/config/hosts/nextcloud/nextcloud.nix +++ b/config/hosts/nextcloud/nextcloud.nix @@ -2,7 +2,7 @@ { services.nextcloud = { enable = true; - package = pkgs.nextcloud33; + package = pkgs.nextcloud32; 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 4c10836..7f55ea4 100644 --- a/config/hosts/valkyrie/containers/uptime-kuma/default.nix +++ b/config/hosts/valkyrie/containers/uptime-kuma/default.nix @@ -3,10 +3,7 @@ containers.uptime-kuma = { autoStart = true; config = { ... }: { - networking = { - useHostResolvConf = true; - resolvconf.enable = false; - }; + networking.useHostResolvConf = true; 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 67cce4a..cb8a45a 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.12"; + elementAdminVersion = "0.1.11"; 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-+vm3oem3B9vEaWBc5I9huaEpgoajN74tJ1K5xt7U9n4="; + sha256 = "sha256-tSUTDPspQJjvP1KN4nUr4LYyjNQFj4pKMMA8JmavIxo="; }; nativeBuildInputs = [ @@ -18,8 +18,8 @@ let pnpmDeps = pkgs.pnpm.fetchDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 3; - hash = "sha256-29clkcYO7xXX5c+cVpyaBIAo3Xyp5z4f13Lg3eWMZ9I="; + fetcherVersion = 2; + hash = "sha256-Hf4PWey5bczSNbc3QQ9z9X3OVUZ7VHXw7BHGQqJWPac="; }; buildPhase = '' diff --git a/flake.lock b/flake.lock index 7f722fe..e709faf 100644 --- a/flake.lock +++ b/flake.lock @@ -21,13 +21,13 @@ "locked": { "lastModified": 1767039857, "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", + "lastModified": 1772893680, + "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", + "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "type": "github" }, "original": { @@ -118,27 +118,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783047444, - "narHash": "sha256-9QKwAEv+CHoCAoWEXMwOLn3Oga3DU8W6mwhbpe1dBZ0=", + "lastModified": 1780815147, + "narHash": "sha256-FSDVygpoXrYLH5ZYcqjNkCZzzQrRYZW3awA9vDgb60g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a613bb3905713cfde9b3a6c24006a55bb8076eb", + "rev": "9a681e663d65ff3b0c636df6c7cfbad31e1ed311", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05-small", + "ref": "nixos-25.11-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-master": { "locked": { - "lastModified": 1783092462, - "narHash": "sha256-3W5BuYd+4meHnB/UYdp/rd+TjjB72bGE2LPmo2WIk1o=", + "lastModified": 1780932787, + "narHash": "sha256-bfcn88kNQTwKjNNc/9Mpn3xdXMwBZ7CR42kbw/4DS4k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0790b99663000a73d2a69f6ba976ee34e5c47d09", + "rev": "8c8caf0bad77cb3fac3812d7680e7995e4c509b0", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1783044540, - "narHash": "sha256-MvaWA0Kz+P0M+5KOtPJN71+h+SXaoFkMIM8PPyVLHPs=", + "lastModified": 1780895883, + "narHash": "sha256-y4ys7/dYufqXMIDH0qIC4C3Qkq7F+9syjlkz1vH7Apo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7008f632a9c5162d4ad399018ba10ffd13af4c90", + "rev": "0265069a40f500e713cbf64f29185b3cfa6c9ba9", "type": "github" }, "original": { @@ -166,16 +166,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779622335, - "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=", + "lastModified": 1773831496, + "narHash": "sha256-JW2/QPyCVzmouqEp1H9kNa8JXd7xEhlam9sy3TYfhDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "705e9929918b43bd7b715dc0a878ac870449bb03", + "rev": "826430a188181a750ffa5948daff334039c5d741", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05-small", + "ref": "nixos-25.11-small", "repo": "nixpkgs", "type": "github" } @@ -198,16 +198,16 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1781301671, - "narHash": "sha256-rq6WOopxq3U2AGEWO80o9LIJDYcYIdgw6jyl+y+19w8=", + "lastModified": 1773912645, + "narHash": "sha256-QHzRqq6gh+t3F/QU9DkP7X63dDDcuIQmaDz12p7ANTg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "661ec59a97ccee13a63f79280b282eb6f7d3f817", + "rev": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-26.05", + "ref": "nixos-25.11", "repo": "nixos-mailserver", "type": "gitlab" } @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1782165805, - "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", + "lastModified": 1780547341, + "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", + "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e46c988..512ca5f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11-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-26.05"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs";