3x-ui on server

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,6 +4,7 @@
 }:
 {
   imports = [
+    ../containers/3x-ui.nix
     ../software/beets
     ./acme.nix
     ./bentopdf.nix
@@ -23,9 +24,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,6 +6,9 @@
   xlib,
   ...
 }:
+let
+  navidromeDir = "/var/lib/services/navidrome-point";
+in
 {
   services = {
     navidrome = {
@@ -15,19 +18,19 @@
       settings = {
         Address = "0.0.0.0";
         Port = 4533;
-        MusicFolder = "${xlib.dirs.server-home}/Music";
+        MusicFolder = "${navidromeDir}";
       };
     };
   };
-  # systemd.mounts = [
+  systemd.mounts = [
-  #   {
+    {
-  #     enable = true;
+      enable = true;
-  #     options = "bind,x-systemd.automount,nofail";
+      options = "bind,x-systemd.automount,nofail";
-  #     requires = [ "local-fs.target" ];
+      requires = [ "local-fs.target" ];
-  #     type = "none";
+      type = "none";
-  #     wantedBy = [ "multi-user.target" ];
+      wantedBy = [ "multi-user.target" ];
-  #     what = "${xlib.dirs.server-home}/Music";
+      what = "${xlib.dirs.server-home}/Music";
-  #     where = "/home/${xlib.device.username}/.config/beets";
+      where = "${navidromeDir}";
-  #   }
+    }
-  # ];
+  ];
 }

modules/server/nginx.nix

@@ -64,6 +64,28 @@ in
             client_max_body_size 5G;
           '';
         };
+        "z.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;