samba fixup

modules/server/default.nix

@@ -18,6 +18,7 @@
     ./nextcloud.nix
     ./nginx.nix
     ./nix-serve.nix
+    # ./onlyoffice.nix
     ./postgresql.nix
     ./samba.nix
     ./step-ca.nix

modules/server/nextcloud.nix

@@ -1,8 +1,8 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
-  inputs,
   xlib,
   ...
 }:
@@ -170,16 +170,6 @@ in
     #     };
     #   };
     # };
-    onlyoffice = {
-      enable = false;
-      # package = previous.onlyoffice-documentserver;
-      hostname = "office.home.arpa";
-      port = 8090;
-      allowLocalConnections = true;
-      wopi = true;
-      jwtSecretFile = config.sops.secrets.onlyoffice-jwt.path;
-      securityNonceFile = config.sops.secrets.onlyoffice-nonce.path;
-    };
   };
 
   # fonts.packages = [ work.corefonts ];
@@ -240,22 +230,6 @@ in
       group = "nextcloud";
       mode = "0650";
     };
-    onlyoffice-nonce = {
-      format = "yaml";
-      key = "nonce";
-      sopsFile = ./secrets/onlyoffice.yaml;
-      owner = "onlyoffice";
-      group = "onlyoffice";
-      mode = "0650";
-    };
-    onlyoffice-jwt = {
-      format = "yaml";
-      key = "jwt";
-      sopsFile = ./secrets/onlyoffice.yaml;
-      owner = "onlyoffice";
-      group = "onlyoffice";
-      mode = "0650";
-    };
     nextcloud-talk-secret = {
       format = "yaml";
       key = "nextcloud-talk-secret";

modules/server/onlyoffice.nix

@@ -0,0 +1,45 @@
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+  xlib,
+  ...
+}:
+let
+  previous = import inputs.nixpkgs-master {
+    system = "x86_64-linux";
+    config.allowUnfree = true;
+    config.allowUnfreePredicate = true;
+  };
+in
+{
+  services.onlyoffice = {
+    enable = true;
+    # package = previous.onlyoffice-documentserver;
+    hostname = "office.home.arpa";
+    port = 8090;
+    allowLocalConnections = true;
+    wopi = true;
+    jwtSecretFile = config.sops.secrets.onlyoffice-jwt.path;
+    securityNonceFile = config.sops.secrets.onlyoffice-nonce.path;
+  };
+  sops.secrets = {
+    onlyoffice-nonce = {
+      format = "yaml";
+      key = "nonce";
+      sopsFile = ./secrets/onlyoffice.yaml;
+      owner = "onlyoffice";
+      group = "onlyoffice";
+      mode = "0650";
+    };
+    onlyoffice-jwt = {
+      format = "yaml";
+      key = "jwt";
+      sopsFile = ./secrets/onlyoffice.yaml;
+      owner = "onlyoffice";
+      group = "onlyoffice";
+      mode = "0650";
+    };
+  };
+}

modules/server/samba.nix

@@ -1,9 +1,15 @@
 {
   config,
+  inputs,
   pkgs,
   xlib,
   ...
 }:
+let
+  stable = import inputs.nixpkgs-master {
+    system = "x86_64-linux";
+  };
+in
 {
   services = {
     samba-wsdd = {
@@ -14,7 +20,7 @@
     };
     samba = {
       enable = true;
-      package = pkgs.samba4Full;
+      package = stable.samba4Full;
       nmbd = {
         enable = true;
       };

modules/vds/nginx.nix

@@ -49,6 +49,10 @@ in
               proxyPass = "http://localhost:2096";
               proxyWebsockets = true;
             };
+            "/clash/" = {
+              proxyPass = "http://localhost:2096";
+              proxyWebsockets = true;
+            };
           };
         };
         "kuma.zeroq.su" = {
@@ -75,6 +79,14 @@ in
             proxyWebsockets = true;
           };
         };
+        "homebox.zeroq.su" = {
+          forceSSL = true;
+          enableACME = true;
+          locations."/" = {
+            proxyPass = "http://${server}:7745";
+            proxyWebsockets = true;
+          };
+        };
         # "agent.zeroq.su" = {
         #   forceSSL = true;
         #   enableACME = true;