From 1fb701aefa568a428b14a5ce56c124df5952f32c Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Sun, 26 Oct 2025 19:24:22 +0300
Subject: [PATCH] 123

---
 modules/server/immich.nix     | 14 +++++++-------
 modules/server/nextcloud.nix  | 14 +++++++-------
 modules/server/postgresql.nix | 16 ++++++++++++++--
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/modules/server/immich.nix b/modules/server/immich.nix
index 60447ea..57d10eb 100644
--- a/modules/server/immich.nix
+++ b/modules/server/immich.nix
@@ -29,13 +29,13 @@ in
     };
   };
 
-  fileSystems."${config.services.immich.mediaLocation}" = {
-    device = "${xlib.dirs.services-folder}/immich";
-    options = [
-      "bind"
-      "nofail"
-    ];
-  };
+  # fileSystems."${config.services.immich.mediaLocation}" = {
+  #   device = "${xlib.dirs.services-folder}/immich";
+  #   options = [
+  #     "bind"
+  #     "nofail"
+  #   ];
+  # };
 
   systemd.tmpfiles.rules = [
     "z ${config.services.immich.mediaLocation} 0755 immich immich -"
diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix
index 8cdeff3..ada5715 100644
--- a/modules/server/nextcloud.nix
+++ b/modules/server/nextcloud.nix
@@ -163,13 +163,13 @@ in
       };
     };
 
-  fileSystems."${config.services.nextcloud.home}" = {
-    device = "${xlib.dirs.services-folder}/nextcloud";
-    options = [
-      "bind"
-      "nofail"
-    ];
-  };
+  # fileSystems."${config.services.nextcloud.home}" = {
+  #   device = "${xlib.dirs.services-folder}/nextcloud";
+  #   options = [
+  #     "bind"
+  #     "nofail"
+  #   ];
+  # };
 
   systemd.tmpfiles.rules = [
     "z ${config.services.nextcloud.home} 0750 nextcloud nextcloud -"
diff --git a/modules/server/postgresql.nix b/modules/server/postgresql.nix
index 64f0416..3d2fa1f 100644
--- a/modules/server/postgresql.nix
+++ b/modules/server/postgresql.nix
@@ -1,8 +1,9 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
-  inputs,
+  xlib,
   ...
 }:
 let
@@ -11,5 +12,16 @@ let
   };
 in
 {
-  services.postgresql.package = pkgs.postgresql_17;
+  services = {
+    postgresql = {
+      enable = true;
+      package = pkgs.postgresql_17;
+      dataDir = "${xlib.dirs.services-mnt-folder}/postgresql/${config.services.postgresql.package.psqlSchema}";
+    };
+    # postgresqlBackup.enable = true;
+  };
+  
+  systemd.tmpfiles.rules = [
+    "z ${config.services.postgresql.dataDir} 0760 postgres postgres -"
+  ];
 }