From ec3d9d128d3b9120c7d08d64b69cae2f42efb020 Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Tue, 7 Oct 2025 09:47:53 +0300
Subject: [PATCH] code clean?

---
 nixosModules/server/default.nix       |  2 +-
 nixosModules/server/immich.nix        | 11 +++-------
 nixosModules/server/nextcloud.nix     | 31 ++++++---------------------
 nixosModules/server/uptime-kuma.nix   | 29 +++++++++++++++++++++++++
 nixosModules/services/uptime-kuma.nix | 21 ------------------
 5 files changed, 39 insertions(+), 55 deletions(-)
 create mode 100644 nixosModules/server/uptime-kuma.nix
 delete mode 100644 nixosModules/services/uptime-kuma.nix

diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix
index 4cbe893..500a89c 100755
--- a/nixosModules/server/default.nix
+++ b/nixosModules/server/default.nix
@@ -6,7 +6,7 @@
   imports = [
     ../software/beets
     ../services/node-red.nix
-    ../services/uptime-kuma.nix
+    ./uptime-kuma.nix
     ./calibre-web.nix
     ./immich.nix
     ./miniflux.nix
diff --git a/nixosModules/server/immich.nix b/nixosModules/server/immich.nix
index b052ce1..13c05fa 100755
--- a/nixosModules/server/immich.nix
+++ b/nixosModules/server/immich.nix
@@ -21,25 +21,20 @@ in
       openFirewall = true;
       accelerationDevices = null;
       machine-learning.enable = true;
-      mediaLocation = "/mnt/immich";
+      mediaLocation = "${xlib.dirs.services-mnt-folder}/immich";
     };
   };
 
   fileSystems."${config.services.immich.mediaLocation}" = {
-    device = "${xlib.dirs.immich-folder}";
+    device = "${xlib.dirs.services-folder}/immich";
     options = [
       "bind"
-      #"uid=1000"
-      #"gid=1000"
-      #"fmask=0007"
-      #"dmask=0007"
       "nofail"
-      "x-systemd.device-timeout=0"
     ];
   };
 
   systemd.tmpfiles.rules = [
-    "z /mnt/immich 0755 immich immich -"
+    "z ${config.services.immich.mediaLocation} 0755 immich immich -"
   ];
 
   users.users.immich.extraGroups = [
diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix
index fd6d495..d1e75cc 100755
--- a/nixosModules/server/nextcloud.nix
+++ b/nixosModules/server/nextcloud.nix
@@ -31,7 +31,7 @@ in
       package = pkgs.nextcloud31;
       hostName = "nextcloud.local";
       database.createLocally = true;
-      home = "/mnt/nextcloud";
+      home = "${xlib.dirs.services-mnt-folder}/nextcloud";
       configureRedis = true;
       caching = {
         redis = true;
@@ -95,10 +95,8 @@ in
     };
     collabora-online = {
       enable = true;
-      #package = stable.collabora-online;
       port = 9980;
       settings = {
-        # Rely on reverse proxy for SSL
         server_name = "office.zeroq.ru";
         ssl = {
           enable = false;
@@ -108,10 +106,6 @@ in
         net = {
           listen = "0.0.0.0";
           post_allow.host = [
-            # "localhost"
-            # "nextcloud.zeroq.ru"
-            # "nextcloud.local"
-            # "100.64.1.0"
             "0.0.0.0"
           ];
         };
@@ -125,7 +119,6 @@ in
     };
     onlyoffice = {
       enable = false;
-      # package = work.onlyoffice-documentserver;
       hostname = "0.0.0.0";
       jwtSecretFile = "${inputs.zeroq-credentials}/services/onlyoffice/jwt.txt";
     };
@@ -134,15 +127,8 @@ in
   fonts.packages = [ work.corefonts ];
 
 
-  networking.hosts = {
-    # "localhost" = [
-    #   "nextcloud.zeroq.ru"
-    #   "office.zeroq.ru"
-    # ];
-    # "0.0.0.0" = [
-    #   "onlyoffice.local"
-    # ];
-  };
+  # networking.hosts = {
+  # };
 
   systemd.services.nextcloud-config-collabora =
   let
@@ -171,21 +157,16 @@ in
     };
   };
 
-  fileSystems."/mnt/nextcloud" = {
-    device = "${xlib.dirs.nextcloud-folder}";
+  fileSystems."${config.services.nextcloud.home}" = {
+    device = "${xlib.dirs.services-folder}/nextcloud";
     options = [
       "bind"
-      #"uid=1000"
-      #"gid=1000"
-      #"fmask=0007"
-      #"dmask=0007"
       "nofail"
-      "x-systemd.device-timeout=0"
     ];
   };
 
   systemd.tmpfiles.rules = [
-    "z /mnt/nextcloud 0750 nextcloud nextcloud -"
+    "z ${config.services.nextcloud.home} 0750 nextcloud nextcloud -"
   ];
 
   environment.systemPackages = [
diff --git a/nixosModules/server/uptime-kuma.nix b/nixosModules/server/uptime-kuma.nix
new file mode 100644
index 0000000..882af08
--- /dev/null
+++ b/nixosModules/server/uptime-kuma.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  xlib,
+  inputs,
+  ...
+}:
+{
+  services.uptime-kuma = {
+    enable = true;
+    settings = {
+      PORT = "4001";
+      HOST = "0.0.0.0";
+    };
+  };
+
+  systemd.tmpfiles.rules = [
+    "z ${xlib.dirs.services-mnt-folder}/uptime-kuma 0755 nobody nogroup -"
+  ];
+
+  fileSystems."/var/lib/private/uptime-kuma" = {
+    device = "${xlib.dirs.services-mnt-folder}/uptime-kuma";
+    options = [
+      "bind"
+      "nofail"
+    ];
+  };
+}
diff --git a/nixosModules/services/uptime-kuma.nix b/nixosModules/services/uptime-kuma.nix
deleted file mode 100644
index 7167f76..0000000
--- a/nixosModules/services/uptime-kuma.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  xlib,
-  inputs,
-  ...
-}:
-{
-  services.uptime-kuma = {
-    enable = true;
-    settings = {
-      PORT = "4001";
-      HOST = "0.0.0.0";
-    };
-  };
-
-  # systemd.tmpfiles.rules = [
-  #   "z ${xlib.dirs.services-mnt-folder}/node-red 0750 node-red node-red -"
-  # ];
-}