path refactoring

modules/server/acme.nix

@@ -17,7 +17,7 @@
       #     server = "https://localhost:9000/acme/acme/directory";
       #     listenHTTP = ":80";
       #     dnsProvider = null;
-      #   };
+      #   };        
       #   # "turn.home.arpa" = {
       #   #   listenHTTP = "127.0.0.1:80";
       #   #   group = "turnserver";

modules/server/default.nix

@@ -4,7 +4,6 @@
 }:
 {
   imports = [
-    ../containers/3x-ui.nix
     ../software/beets
     ./acme.nix
     ./bentopdf.nix
@@ -24,9 +23,9 @@
     ./postgresql.nix
     ./power.nix
     ./samba.nix
+    # ./step-ca.nix
     ./syncthing.nix
     ./systemd.nix
-    # ./step-ca.nix
     # ../containers/remnawave.nix
     # ./coturn.nix
     # ./mealie.nix

modules/server/navidrome.nix

@@ -6,9 +6,6 @@
   xlib,
   ...
 }:
-let
-  navidromeDir = "/var/lib/services/navidrome-point";
-in
 {
   services = {
     navidrome = {
@@ -18,19 +15,8 @@ in
       settings = {
         Address = "0.0.0.0";
         Port = 4533;
-        MusicFolder = "${navidromeDir}";
+        MusicFolder = "/mnt/beets/music";
       };
     };
   };
-  systemd.mounts = [
-    {
-      enable = true;
-      options = "bind,x-systemd.automount,nofail";
-      requires = [ "local-fs.target" ];
-      type = "none";
-      wantedBy = [ "multi-user.target" ];
-      what = "${xlib.dirs.server-home}/Music";
-      where = "${navidromeDir}";
-    }
-  ];
 }

modules/server/nginx.nix

@@ -64,28 +64,6 @@ in
             client_max_body_size 5G;
           '';
         };
-        "x.zeroq.su" = {
-          forceSSL = true;
-          enableACME = true;
-          locations = {
-            "/" = {
-              proxyPass = "http://${server}:2049";
-              proxyWebsockets = true;
-            };
-            "/subs/" = {
-              proxyPass = "http://${server}:2096";
-              proxyWebsockets = true;
-            };
-            "/subsjs/" = {
-              proxyPass = "http://${server}:2096";
-              proxyWebsockets = true;
-            };
-            "/clash/" = {
-              proxyPass = "http://${server}:2096";
-              proxyWebsockets = true;
-            };
-          };
-        };
         # "pdf.home.arpa" = {
         #   forceSSL = true;
         #   enableACME = true;

modules/vds/nginx.nix

@@ -17,7 +17,7 @@ in
       recommendedProxySettings = true;
       recommendedTlsSettings = true;
       virtualHosts = {
-        "pubray1.zeroq.su" = {
+        "x.zeroq.su" = {
           forceSSL = true;
           enableACME = true;
           locations = {
@@ -45,7 +45,7 @@ in
   security.acme = {
     acceptTerms = true;
     defaults = {
-      email = "oqyude@gmail.com";
+      email = "go.bin043120@gmail.com";
     };
   };
   networking.firewall.allowedTCPPorts = [