Merge branch 'production' into next

devices/nas/default.nix

@@ -53,7 +53,7 @@ inputs:
         snapper.enable = true;
         samba = { enable = true; hostsAllowed = "192.168. 127."; shares = { home.path = "/home"; root.path = "/"; }; };
         sshd = {};
-        xray.client.dae.wanInterface = [ "enp3s0" ];
+        xray.client = { dae.wanInterface = [ "enp3s0" ]; dnsmasq.hosts."git.nas.chn.moe" = "127.0.0.1"; };
         groupshare = {};
         smartd.enable = true;
         beesd.instances =

devices/surface/default.nix

@@ -62,7 +62,7 @@ inputs:
     services.iptsd.config =
     {
       Touch = { DisableOnPalm = true; DisableOnStylus = true; Overshoot = 0.5; };
-      Contacts = { Neutral = "Average"; NeutralValue = 50; };
+      Contacts = { Neutral = "Average"; NeutralValue = 100; };
     };
   };
 }

devices/vps6/default.nix

@@ -35,7 +35,7 @@ inputs:
       {
         snapper.enable = true;
         sshd = {};
-        xray.server = { serverName = "vps6.xserver.chn.moe"; userNumber = 17; };
+        xray.server = { serverName = "vps6.xserver.chn.moe"; userNumber = 18; };
         frpServer = { enable = true; serverName = "frp.chn.moe"; };
         nginx =
         {

devices/vps6/secrets.yaml

@@ -38,6 +38,8 @@ xray-server:
         user15: ENC[AES256_GCM,data:6AskiMLLl0HV6tm2rYpV46XW0jePQy+wme2oi3M7He7WsgVM,iv:lGfnFn69Vnjv5J3rp5sRazD5/B+8Nk8MNG7HIyf4HKA=,tag:Vbg82tdn3noOfhKVVx0Phg==,type:str]
         #ENC[AES256_GCM,data:4jJkbMD9Psxrag==,iv:arRtRaNrqnYcT7vE3wqgl/y8/65ORaxqTdGw55AKDP8=,tag:pRpta6mXfy0XCyzMA4+cEQ==,type:comment]
         user16: ENC[AES256_GCM,data:fo6KJXlPDn7+FmxjEJQo9d79rDYemLFx6LanYZcJpKJR7Gxq,iv:yEUKPNZ9idrSqyVO9fhksP/7bjPMT/LzNK2VSq503/c=,tag:M87D44SIo9JzDB3ZyKu7fA==,type:str]
+        #ENC[AES256_GCM,data:/Kec+CdtnT11EA==,iv:DnmbWfgriaE6XAnMqq2UXhHhN+Rd/3YRodKVUCJo6p4=,tag:NimqZpbslKxwzoljaZqEdw==,type:comment]
+        user17: ENC[AES256_GCM,data:gQInIcNFxJuCSsMDGq4yTp5JdMMmJRy1tY3PGLoLuuIXWV0a,iv:ya4n9Z7T9/bxeHqi5QqwJprEzDMsT6X0BuEXRS67wWk=,tag:RcjQfAHv8uc3PgN5c4bySA==,type:str]
     private-key: ENC[AES256_GCM,data:ts/LRGFAsYqvGvkvlxUI42IW1a8cGsSkpZhMDd3QVceRKvhPb1SRDaXoSw==,iv:6xX9xFIFUNlLBZ6CPBOz9JbHpvC4+QG9ZaCZcWdl12c=,tag:DYIa+QTV8vyl1l7OKKykTw==,type:str]
 nginx:
     #ENC[AES256_GCM,data:85LrqdTMIhSa,iv:mIQPYz8VPd5AxeMCQEdTGMD0Iqa5QEAa5+8JVFaj3JM=,tag:TcZd7S3WRPpEV9lHI1fzbw==,type:comment]
@@ -81,8 +83,8 @@ sops:
             ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
             ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-19T06:58:42Z"
-    mac: ENC[AES256_GCM,data:ZDNnwgXVSnR0XtPus9LQrVPDKs1G0PI5MHc9w2OPgbF1fbL+DyUTVzzo1pk0QyHF67c/UAc+pJc1TYK1mDW0ouCDya2CljvYYyRr0OrReBGApkOKozn4Jys8G3akR9iFhdh3CRBZ0JwfTc3+eY0fE2ZGDCYBiWlwjAX5TNydmjI=,iv:Q4kVzEz9bwWfQB17FgLhmh7/TJ/UaMPwcrjVTz5DyUg=,tag:acCEHIM0op9U0+wmYKWgiQ==,type:str]
+    lastmodified: "2024-05-25T09:01:19Z"
+    mac: ENC[AES256_GCM,data:xYK5VTYHwryDcH0fhnezn5aYQ+XAPAJ7PIrL1ygKw3F/rAwRQlWk0/zmqypmpqbPX4mAJKzDfgoTNh8iUtF8ehmfOS+7OPUTuKVRvPI39HfcJbRN3/oOdN40AXSa5cZjgKrAGdhWvwyw0WdDMkRfwJztAR5Jj0dKzZ5THW+5zSs=,iv:Y5UUe1I95ltiVcUPBUcmIpnKHFfAlQmcF8ZlxZht1i4=,tag:3mA/epV254+P7WkkuhDOqg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

modules/packages/server.nix

@@ -53,10 +53,19 @@ inputs:
             extraConfig =
             {
               core.editor = if inputs.config.nixos.system.gui.preferred then "code --wait" else "vim";
+              http.postBuffer = 624288000;
               advice.detachedHead = false;
               merge.conflictstyle = "diff3";
               diff.colorMoved = "default";
-              lfs.activitytimeout = 600;
+              lfs =
+              {
+                concurrenttransfers = 10;
+                activitytimeout = 3600;
+                dialtimeout = 3600;
+                keepalive = 3600;
+                tlstimeout = 3600;
+                transfer.maxretries = 1;
+              };
             };
             package = inputs.pkgs.gitFull;
             delta =

modules/services/nginx/default.nix

@@ -246,9 +246,9 @@ inputs:
               access_log syslog:server=unix:/dev/log http;
               proxy_ssl_server_name on;
               proxy_ssl_session_reuse off;
-              send_timeout 10m;
+              send_timeout 1d;
             '';
-            proxyTimeout = "10m";
+            proxyTimeout = "1d";
             recommendedZstdSettings = true;
             recommendedTlsSettings = true;
             recommendedProxySettings = true;