From 10a7111f1c8a0857f9ce06869e1b9f8923025da7 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 12 Jun 2024 21:26:57 +0200
Subject: [PATCH 1/2] nixos: services: mealie: fix DB auth

Turns out the package update [1] was because someone couldn't make it
work on the previous version, and added a new setting to configure it
more easily :-).

[1]: https://github.com/NixOS/nixpkgs/pull/314294
---
 modules/nixos/services/mealie/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/nixos/services/mealie/default.nix b/modules/nixos/services/mealie/default.nix
index 55ac376..96b9e14 100644
--- a/modules/nixos/services/mealie/default.nix
+++ b/modules/nixos/services/mealie/default.nix
@@ -35,12 +35,8 @@ in
 
         # Use PostgreSQL
         DB_ENGINE = "postgres";
-        POSTGRES_USER = "mealie";
-        POSTGRES_PASSWORD = "";
-        POSTGRES_SERVER = "/run/postgresql";
-        # Pydantic and/or mealie doesn't handle the URI correctly, hijack it
-        # with query parameters...
-        POSTGRES_DB = "mealie?host=/run/postgresql&dbname=mealie";
+        # Make it work with socket auth
+        POSTGRES_URL_OVERRIDE = "postgresql://mealie:@/mealie?host=/run/postgresql";
       };
     };
 

From d37c767a2f0999fbe10e7c2b6a969c1bf39137f3 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 12 Jun 2024 21:29:19 +0200
Subject: [PATCH 2/2] nixos: services: forgejo: fix deprecated config

---
 modules/nixos/services/forgejo/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/nixos/services/forgejo/default.nix b/modules/nixos/services/forgejo/default.nix
index 0f3dfc5..18538be 100644
--- a/modules/nixos/services/forgejo/default.nix
+++ b/modules/nixos/services/forgejo/default.nix
@@ -83,7 +83,11 @@ in
         # I configure my backup system manually below.
         dump.enable = false;
 
-        mailerPasswordFile = lib.mkIf cfg.mail.enable cfg.mail.passwordFile;
+        secrets = {
+          mailer = lib.mkIf cfg.mail.enable {
+            PASSWD = cfg.mail.passwordFile;
+          };
+        };
 
         settings = {
           DEFAULT = {