rolling update in 20240614

Signed-off-by: iosmanthus <[email protected]>
iosmanthus · Jun 14, 2024 · ae04efd · ae04efd
1 parent 98df57e
commit ae04efd
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 39 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nixos/gcp-instance-0/subgen/template.jsonnet b/nixos/gcp-instance-0/subgen/template.jsonnet
@@ -92,6 +92,10 @@
         outbound: 'dns-out',
         protocol: 'dns',
       },
+      {
+        protocol: 'bittorrent',
+        outbound: 'direct',
+      },
       {
         clash_mode: 'Direct',
         outbound: 'direct',

diff --git a/nixos/workstation/home/vscode/extensions.json b/nixos/workstation/home/vscode/extensions.json
@@ -21,8 +21,8 @@
         {
             "publisher": "christian-kohler",
             "name": "path-intellisense",
-            "version": "2.8.5",
-            "sha256": "1ndffv1m4ayiija1l42m28si44vx9y6x47zpxzqv2j4jj7ga1n5z"
+            "version": "2.9.0",
+            "sha256": "1sshl8za6wviaikad8pisisn2x1y382npsh7grw3vdfi4j3awb8g"
         },
         {
             "publisher": "DotJoshJohnson",
@@ -45,8 +45,8 @@
         {
             "publisher": "GitHub",
             "name": "copilot",
-            "version": "1.196.0",
-            "sha256": "0m5z08m93fhk1vk264inrbzn65p9790xrdab8p38ghbydhb3zscs"
+            "version": "1.200.920",
+            "sha256": "0d7m8kslrlka7gamvbvxmp9rd2lbsiyrymc70q1hpzwds5ds3i1c"
         },
         {
             "publisher": "golang",
@@ -93,8 +93,8 @@
         {
             "publisher": "ms-vscode-remote",
             "name": "remote-containers",
-            "version": "0.367.0",
-            "sha256": "1g0b7qrh6k45zx4bj67xbf0h1li9ls3cnxlbphpsh753q86ph9dk"
+            "version": "0.371.0",
+            "sha256": "1b26xyv661xp76nqg4fnnbf9m7kaf6pn50ld1amj0a9gncvf0wj5"
         },
         {
             "publisher": "ms-vscode",
@@ -153,8 +153,8 @@
         {
             "publisher": "github",
             "name": "vscode-github-actions",
-            "version": "0.26.2",
-            "sha256": "16kp1yxs798jp8ffqq3ixm3pyz4f3wgdkdyjpjy94ppqp4aklixh"
+            "version": "0.26.3",
+            "sha256": "17p4xjanmaphfx63s6cdji6b237n3ndkfzjjndsvk64imrh2jxdl"
         },
         {
             "publisher": "ms-kubernetes-tools",

diff --git a/packages/sing-box/default.nix b/packages/sing-box/default.nix
@@ -9,18 +9,18 @@
 
 buildGoModule rec {
   pname = "sing-box";
-  version = "1.10.0-alpha.4";
+  version = "1.10.0-alpha.11";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-6U3WhfH54FItyvSODycBdcX/sLNZ/k8Mo6xJIZHjgm0=";
+    hash = "sha256-n4uN/Ia75GmzaVCUzEjrllD+jyA1IvWOiwyu98QsJb4=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-zCfz4uqPxmQ90sImiEFp7Rz16SqopvWCTzOV1YOxGCw=";
+  vendorHash = "sha256-1BvfMqmZhM2iOg+mIyy6ZjxjpqtQNg5rKmmbPN2H7MI=";
 
   tags = [
     "with_quic"

diff --git a/secrets/cloud/sing-box/secrets.json b/secrets/cloud/sing-box/secrets.json
@@ -2,7 +2,7 @@
 	"sing-box": {
 		"shadowsocks": {
 			"method": "ENC[AES256_GCM,data:sDrimGk8FGrPxoqrbdjitSdmrNZms94=,iv:IN4XnybzsQMD2hlxbczjBJCSLaZz/2zVXtG/XStaUI0=,tag:+6NHHFealu0RfAeFrWSN4w==,type:str]",
-			"password": "ENC[AES256_GCM,data:pQjbiKOYKHf50go3nxMuA1zXoj+WAtba,iv:EoT83mZEETU/+ho1Pn1xw+qUOUp42zueN4aBu5CDCBs=,tag:I3TrQldifVMbYxjQozgYAQ==,type:str]",
+			"password": "ENC[AES256_GCM,data:aTHMhQ6pU3ntXe1p/HAi+zjOK4HEIfW5,iv:prfyxYXDx2FCIZw7bP1wp8EP7n4cX4yYEqb/cNmwVRs=,tag:sBl/x0VRvGii/AD1kgK1ag==,type:str]",
 			"users": [
 				{
 					"name": "ENC[AES256_GCM,data:1ZIFQs7l,iv:Z2pkuOF9WDfH1JPGB8Ev/TAphmEuWzBiqAjAduZbaGo=,tag:dgAHS+MLfD/cubv739K/9w==,type:str]",
@@ -36,7 +36,7 @@
 		},
 		"shadowtls": {
 			"handshake": {
-				"server": "ENC[AES256_GCM,data:sjn2e6BL4tLF4oCsTksFYlmNNKdc,iv:wja0GVlNotQZCXfLvuB7lPRkW9mfZF5k3DZPewwrbKU=,tag:RYbx9Jznx3Tm3Z29CJHk2A==,type:str]"
+				"server": "ENC[AES256_GCM,data:n0Wx180MV57ulYf2EOZQIc6ufYrvSeE=,iv:6ytrJ/W3pFkilz4iQg3bjpI2EZcV01Nz68sBVa6SPV4=,tag:wrrA/Tj3BfuNBSRMgxQHlw==,type:str]"
 			},
 			"password": "ENC[AES256_GCM,data:M+x0OQ1Y3r3UrMSh8vk3pUOVcNmcf1PN1lAot3u9SwZSnD6s,iv:GqqdUlG5IejsgLRGlxLo+MhJXFNM0Qm+Ui+hj0Bj4R8=,tag:wLCNwwt5vgdInKv0tbS9OQ==,type:str]",
 			"username": "ENC[AES256_GCM,data:Fym2LA19uQ==,iv:P+ueo9ciJH7mJwl8BMc+yYuOIcT7Z98ShWSZ1m6SBAk=,tag:7buRFqJ4BY5ftynjXAhVOg==,type:str]"
@@ -65,8 +65,8 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVemtERjkzdmIxQkpPd0Ur\nQktvUnFtVDZabVRxOWR3NFdZcU91SDBmeENBCkR5ZXRYb1Z4WFZjdnpIZ0JTTVZm\ndDQyakRXNHRIQzNycEJhaEhDSkx1V2MKLS0tIEJ3WElqZjZXZkJWaUdhbVV4SWtw\nWUFDWEdwY1BsYmFEbHNHZ0p4a0RvNWsKwFMCCaIBjIKR/dk3BinKuyIgpdaXOJ3S\nqL3XmRLm9pRC2hkuEw+lZ/W3uHbSaDMavg5qi2qKxNmeHo2rfwcBfQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2024-06-06T07:58:28Z",
-		"mac": "ENC[AES256_GCM,data:9SOwTygngPrChr3vtr81i27p9Byt82I3D/IxA+rVd/+E4WU6w//LoSpXzshxV4my/T/xyMOBqnSRDGpEZzrxlUSPBSusNqr7IbcHbyEDgz0EZraedqpzC7n40MkTRNRatAo2zwXrXN9gqH867cq7nP47pR1tdfxJ4CG9GnQUFV8=,iv:OPc6qXySHHSFrGWcqj7Vfnw7aJSnIeKSumBc33wE9B4=,tag:l2lxO6HRLInC1gRiyFsLGw==,type:str]",
+		"lastmodified": "2024-06-07T07:38:46Z",
+		"mac": "ENC[AES256_GCM,data:s6vUIAH1kPn25O0i0mD7DIilDBZ1oKWZdsB5cW4XnwW4uCFKY28OFEKNx3SvrWHsV1614WASZvSMdhvP3CZMFLd4MiHuUq4QEoYHB9fg0k4ZScWxYKJNO77KgDJaDl7BnHwMEqyBEWKlB1e1AAR9OPXpD2Nwnszot5XO3k2q7Bs=,iv:kSzVb1PJjl4nDi3izw3ysx30P7rzGjhPyjc63AgQs50=,tag:W2YnrKd0A7EYxQGkol7eJA==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.8.1"

diff --git a/secrets/workstation/sing-box b/secrets/workstation/sing-box
diff --git a/secrets/workstation/update.py b/secrets/workstation/update.py
@@ -23,22 +23,7 @@ def get(url):
 
 
 def override(resp):
-    obj = json.loads(resp)
-    if 'route' not in obj:
-        raise Exception("No `route` field found in response")
-
-    i = 0
-    for rule in obj['route']['rules']:
-        if rule['protocol'] == 'dns':
-            break
-        i += 1
-
-    obj['route']['rules'].insert(i + 1, {
-        'protocol': 'bittorrent',
-        'outbound': 'direct',
-    })
-
-    return obj
+    return json.loads(resp)
 
 
 url = decrypt("./secrets.yaml")['sing-box-url']