systems/etna/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  pkgs,
   config,
   _utils,
   ...
@@ -27,10 +28,6 @@ in
     secrets.generate
     cfTunnelSecret.generate
 
-    # essential configs, do not remove
-    ./postgresql.nix
-
-    # services
     ./cobalt.nix
     ./dendrite.nix
     ./forgejo.nix
@@ -62,6 +59,11 @@ in
     openssh.openFirewall = true;
     nginx.enable = true;
 
+    postgresql = {
+      enable = true;
+      package = pkgs.postgresql_16;
+    };
+
     frp = {
       enable = true;
       role = "client";

systems/etna/nextcloud.nix

@@ -28,7 +28,6 @@ in
 
     config = {
       adminpassFile = adminPass.path;
-      dbtype = "sqlite";
     };
   };
 }

systems/etna/postgresql.nix

@@ -1,19 +0,0 @@
-{ pkgs, ... }:
-{
-  services = {
-    postgresql = {
-      enable = true;
-      package = pkgs.postgresql_16;
-
-      port = 5432;
-      enableTCPIP = true;
-    };
-
-    postgresqlBackup = {
-      enable = true;
-      backupAll = true;
-      compression = "zstd";
-      location = "/data/backups/postgresql";
-    };
-  };
-}