From 06ec73de0bcf88996ad5de19e6dc3d26987a08d0 Mon Sep 17 00:00:00 2001
From: blake <me@blakedheld.xyz>
Date: Fri, 17 Oct 2025 20:03:56 -0500
Subject: [PATCH] database backup refining

---
 modules/homelab/immich/default.nix           |  2 +-
 modules/homelab/minecraft_recpro/default.nix |  2 +-
 modules/system/backups/default.nix           | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/homelab/immich/default.nix b/modules/homelab/immich/default.nix
index 83f1f5f..34c29ab 100644
--- a/modules/homelab/immich/default.nix
+++ b/modules/homelab/immich/default.nix
@@ -109,7 +109,7 @@ in {
 
     # add to backups
     system.backups.baks = {
-      ${service} = {paths = [cfg.data_dir "/var/lib/redis-immich"];};
+      ${service} = {paths = [cfg.data_dir "/var/lib/redis-immich" "/var/backups/postgresql/immich.sql.zst"];};
     };
   };
 }
diff --git a/modules/homelab/minecraft_recpro/default.nix b/modules/homelab/minecraft_recpro/default.nix
index 43ca2a6..1b623b0 100644
--- a/modules/homelab/minecraft_recpro/default.nix
+++ b/modules/homelab/minecraft_recpro/default.nix
@@ -117,7 +117,7 @@ in
       lib.mapAttrsToList (srv_name: cfg:
         {
           name = srv_name;                     # attribute key
-          value = { paths = [ cfg.data_dir ]; }; # attribute value
+          value = { paths = [ cfg.data_dir "/var/backups/${service}_db.zst" ]; }; # attribute value
         }
       ) servers
     );
diff --git a/modules/system/backups/default.nix b/modules/system/backups/default.nix
index b3ee9a6..ad5c502 100644
--- a/modules/system/backups/default.nix
+++ b/modules/system/backups/default.nix
@@ -160,23 +160,20 @@ in {
       enable = true;
       location = "/var/backup/mysql";
       user = "root";
-      startAt = "03:58";
-      compression = "zstd";
+      calendar = "03:58:00";
+      compressionAlg = "zstd";
       databases = config.services.mysql.ensureDatabases; # set to all databases defined in esure databases
     };
-    services.postgresqlBackup = config.services.postgresql.enable {
+    services.postgresqlBackup = lib.mkIf config.services.postgresql.enable {
       # immich uses this
       enable = true;
       location = "/var/backup/postgresql";
-      compression = "gzip"; # optional: "xz", "zstd", "none"
+      compression = "zstd"; # optional: "xz", "zstd", "none"
       startAt = "03:58";
-      user = "postgres";
       databases = ["immich"]; # set to all databases defined in esure databases
       #databases = config.services.postgresql.ensureDatabases; # set to all databases defined in esure databases
     };
 
-    services.mysql.ensureDatabases = ["FUCKING_NOTICE_ME"];
-
     # install borg binary
     environment.systemPackages = with pkgs; [borgbackup tree];