path refactoring

modules/containers/3x-ui.nix

@@ -5,6 +5,9 @@
   xlib,
   ...
 }:
+let
+  panel = "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}/3x-ui";
+in
 {
   virtualisation = {
     podman = {
@@ -25,8 +28,8 @@
           "TZ" = "Europe/Moscow";
         };
         volumes = [
-          "${xlib.dirs.services-mnt-folder}/containers/3x-ui/cert/:/root/cert:rw"
-          "${xlib.dirs.services-mnt-folder}/containers/3x-ui/db/:/etc/x-ui:rw"
+          "${panel}/cert/:/root/cert:rw"
+          "${panel}/db/:/etc/x-ui:rw"
         ];
         log-driver = "journald";
         extraOptions = [
@@ -97,13 +100,13 @@
     };
     # Folders
     tmpfiles.rules = [
-      "d /mnt 0755 root root -"
-      "d /mnt/services 0755 root root -"
-      "d /mnt/services/containers 0755 root root -"
-      "d /mnt/services/containers/3x-ui 0755 root root -"
-      "d /mnt/services/containers/3x-ui/cert 0755 root root -"
-      "d /mnt/services/containers/3x-ui/db 0755 root root -"
-      "Z /mnt/services/containers/3x-ui 0755 root root -"
+      "d ${xlib.dirs.services-mnt-folder} 0755 root root -"
+      "d ${xlib.dirs.services-nodes-folder} 0755 root root -"
+      "d ${xlib.dirs.services-nodes-folder}/${xlib.device.hostname} 0755 root root -"
+      "d ${panel} 0755 root root -"
+      "d ${panel}/db 0755 root root -"
+      "d ${panel}/cert 0755 root root -"
+      "Z ${panel} 0755 root root -"
     ];
   };
 

modules/options.nix

@@ -118,6 +118,11 @@
           default = "/mnt/services";
           description = "All services folder.";
         };
+        services-nodes-folder = lib.mkOption {
+          type = lib.types.str;
+          default = "${config.xlib.dirs.services-mnt-folder}/nodes";
+          description = "All nodes folder.";
+        };
         postgresql-folder = lib.mkOption {
           type = lib.types.str;
           default = "${config.xlib.dirs.services-mnt-folder}/postgresql";

modules/server/calibre-web.nix

@@ -13,7 +13,7 @@ in
 {
   services = {
     calibre-web = {
-      package = stable.calibre-web;
+      # package = stable.calibre-web;
       enable = true;
       # dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web";
       options = {

modules/server/power.nix

@@ -13,10 +13,4 @@
     power-profiles-daemon.enable = lib.mkForce false;
     throttled.enable = false;
   };
-
-  environment = {
-    systemPackages = with pkgs; [
-      cpupower-gui
-    ];
-  };
 }

modules/vds/systemd.nix

@@ -8,8 +8,8 @@
 let
   serviceName = "rsync-services-sync";
   serverAddress = "oqyude@100.64.0.0";
-  serverDir = "/mnt/services/nodes/vds";
-  nodeDir = "/mnt/services";
+  serverDir = "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}";
+  nodeDir = "${xlib.dirs.services-mnt-folder}";
 in
 {
   systemd = {