chore(arumi): friendship ended with sing-box, now xray is my new best friend

hosts/arumi/services/sing-box.nix

@@ -1,53 +1,69 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
-  desu.secrets.arumi-singbox-pk = {};
+  desu.secrets.arumi-singbox-pk.owner = "xray";
-  desu.secrets.arumi-singbox-sid = {};
+  desu.secrets.arumi-singbox-sid.owner = "xray";
-  desu.secrets.arumi-singbox-users = {};
+  desu.secrets.arumi-singbox-users.owner = "xray";
 
-  services.sing-box = {
+  users.users.xray = {
+    isNormalUser = true;
+    uid = 1102;
+  };
+
+  services.xray = {
     enable = true;
-    settings = {
+    settingsFile = "/etc/xray/config.json";
+  };
+
+  systemd.tmpfiles.rules = [
+    "d /etc/xray 0700 1102 1102 -"
+  ];
+  systemd.services.xray.serviceConfig = {
+    DynamicUser = lib.mkForce false;
+    User = "xray";
+  };
+  systemd.services.xray.preStart = let 
+    file = "/etc/xray/config.json";
+    template = pkgs.writeText "config.json" (builtins.toJSON {
       log = { level = "info"; timestamp = true; };
       inbounds = [
         {
-          type = "vless";
+          port = 443;
-          tag = "vless-in";
+          protocol = "vless";
-          listen = "::";
+          settings = {
-          listen_port = 443;
+            decryption = "none";
-          sniff = true;
+            clients = []; # populated later in the preStart script
-          sniff_override_destination = true;
-          domain_strategy = "ipv4_only";
-          users = []; # populated later in the preStart script
-          tls = let server = "updates.cdn-apple.com"; in {
-            enabled = true;
-            server_name = server;
-            reality = {
-              enabled = true;
-              handshake = { inherit server; server_port = 443; };
-              private_key._secret = config.desu.secrets.arumi-singbox-pk.path;
-              short_id = [ 
-                { _secret = config.desu.secrets.arumi-singbox-sid.path; }
-              ];
           };
+          streamSettings = {
+            network = "tcp";
+            security = "reality";
+            realitySettings = {
+              alpn = [ "h2" ];
+              target = "updates.cdn-apple.com:443"; 
+              serverNames = [ "updates.cdn-apple.com" ];
+              privateKey = ""; # populated later in the preStart script
+              shortIds = []; # populated later in the preStart script
+            };
+          };
+          sniffing = {
+            enabled = true;
+            destOverride = [ "tls" "http" "quic" ];
+            routeOnly = true;
           };
         }
       ];
       outbounds = [
-        { type = "direct"; tag = "direct"; }
+        { protocol = "freedom"; tag = "direct"; }
-        { type = "block"; tag = "block"; }
       ];
-    };
+    });
-  };
-
-  systemd.services.sing-box.preStart = let 
-    file = "/etc/sing-box/config.json";
   in ''
     users=$(${pkgs.yaml2json}/bin/yaml2json < ${config.desu.secrets.arumi-singbox-users.path})
-    ${pkgs.jq}/bin/jq --arg users "$users" \
+    pk=$(cat ${config.desu.secrets.arumi-singbox-pk.path})
-      '.inbounds[0].users = ($users | fromjson | map({ "uuid": ., "flow": "xtls-rprx-vision" }))' \
+    sid=$(cat ${config.desu.secrets.arumi-singbox-sid.path})
-      ${file} > ${file}.tmp
+    ${pkgs.jq}/bin/jq --arg users "$users" --arg pk "$pk" --arg sid "$sid" \
-    mv ${file}.tmp ${file}
+      '.inbounds[0].settings.clients = ($users | fromjson | map({ "id": ., "flow": "xtls-rprx-vision" }))
+        | .inbounds[0].streamSettings.realitySettings.privateKey = $pk
+        | .inbounds[0].streamSettings.realitySettings.shortIds = [$sid]' ${template} > ${file}
   '';
 
   networking.firewall.allowedTCPPorts = [ 443 ];