diff --git a/flake.lock b/flake.lock
index c4de61b7..2c64a7ae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -189,11 +189,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709439398,
-        "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=",
+        "lastModified": 1709773529,
+        "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57",
+        "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b",
         "type": "github"
       },
       "original": {
@@ -515,11 +515,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709445365,
-        "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=",
+        "lastModified": 1709764752,
+        "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7",
+        "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
         "type": "github"
       },
       "original": {
@@ -612,11 +612,11 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1709477458,
-        "narHash": "sha256-HOdiWuxKAcQyrime3pGA78+PV6fLCknwM2BBqqS4wwA=",
+        "lastModified": 1709879557,
+        "narHash": "sha256-yiLrzUqTSWYIoYYr9qtIaFePuVO6A7kDvyQ1+XvVNwM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b8e669fe2928a4c0bce72cef7c4d81c9a6b0ec62",
+        "rev": "43235ab13a0ebb86b71cb3c56f0c3fdc677b8f7a",
         "type": "github"
       },
       "original": {
@@ -654,11 +654,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709476653,
-        "narHash": "sha256-5J+9nSxFRF8RdmIVNOE5t/IHAPzMiQgIqVEfF1sVecM=",
+        "lastModified": 1709835941,
+        "narHash": "sha256-rbg2obctAsenmuU39XcaWxflShuwAEDqjhWwDX+H2qY=",
         "owner": "linyinfeng",
         "repo": "nur-packages",
-        "rev": "2f36e828b4d918695f9030111af58150cee9ffdf",
+        "rev": "0b7c5ab6888c6f9864792393168a256904244a01",
         "type": "github"
       },
       "original": {
@@ -713,11 +713,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1709389313,
-        "narHash": "sha256-c6i3Jq5Z5kqK5xOBQOso/C1DTrkgVzKMpzkPWFY1igA=",
+        "lastModified": 1709853674,
+        "narHash": "sha256-Cs+4eVrrNuOqWPPdmW/gdkfrwkD99OTadft97Wsev+E=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "dc8c086c7e73a9035c34be6416e7c465d61edc0e",
+        "rev": "dc2379b89bd00cf7aa661e1b000d2a419843df3f",
         "type": "github"
       },
       "original": {
@@ -742,11 +742,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709424235,
-        "narHash": "sha256-znvi6iSclLj9VpJspgw1x/ODCFsiuRIY8dk9vqR5qNM=",
+        "lastModified": 1709856615,
+        "narHash": "sha256-FMH6VzbgpnljnRE5s7anzMLy8+JEWoFFOMLgXhhO1W0=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "22225800f7c24e7460026a5b6c9c94187d67555f",
+        "rev": "4e6758ba6616b7b9a251d1815d858d5f4897bea4",
         "type": "github"
       },
       "original": {
@@ -786,11 +786,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709435391,
-        "narHash": "sha256-s4itTkIVxn5lYeTzwkbAgl99atnjdZv1idI1118vdzA=",
+        "lastModified": 1709708644,
+        "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "93554c04c2f1c02f4a383538e8848d511c3129e9",
+        "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b",
         "type": "github"
       },
       "original": {
@@ -868,11 +868,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1709703039,
+        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
         "type": "github"
       },
       "original": {
@@ -923,11 +923,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709339846,
-        "narHash": "sha256-skUtS/2hrPRU9ITopiQhTNSsibWDsh7LIJqOd5DGisY=",
+        "lastModified": 1709858234,
+        "narHash": "sha256-FQiXd7YclM45NJ4E9dhEjX874umzA1joAAAPVfuW04U=",
         "owner": "nix-community",
         "repo": "nixpkgs-terraform-providers-bin",
-        "rev": "0e857580ec27a487828ea787ab73eaa822eb2b45",
+        "rev": "1fb60e1569014863012f749557285855f4c13ad8",
         "type": "github"
       },
       "original": {
@@ -1002,11 +1002,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1709476973,
-        "narHash": "sha256-VBL/iUSsoosRawEaQdNsY+Cld+F+Hxbynfg62/aVc0I=",
+        "lastModified": 1709879657,
+        "narHash": "sha256-pb2qyDfjmdCIh/HwHj0LAIKBOGcKL22KSYt1BKIrgvU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9029b6ce991c4beabbfe3c9e39a901a6f8a4a213",
+        "rev": "5c70fdaf1205fa010f458b6a2f3835f14e32e3b4",
         "type": "github"
       },
       "original": {
@@ -1140,11 +1140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709434911,
-        "narHash": "sha256-UN47hQPM9ijwoz7cYq10xl19hvlSP/232+M5vZDOMs4=",
+        "lastModified": 1709711091,
+        "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "075df9d85ee70cfb53e598058045e1738f05e273",
+        "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc",
         "type": "github"
       },
       "original": {
@@ -1272,11 +1272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709336539,
-        "narHash": "sha256-BGyDNCiQ2gBx10YZDlCOonRY4iDdxLWbAi9TAroRHQU=",
+        "lastModified": 1709839060,
+        "narHash": "sha256-Z2GAn/P/dyjvEyB0W2sbub4sjFb+gR9QyrHE1tfzKSI=",
         "owner": "tailscale",
         "repo": "tailscale",
-        "rev": "232a2d627c54a95737a1491c7d381323f1c9690b",
+        "rev": "74e33b9c508566b188eeadf18087de6f14c96e95",
         "type": "github"
       },
       "original": {
@@ -1292,11 +1292,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709373438,
-        "narHash": "sha256-F/Vieen5x2nf05KJ5AitoE/GSB0FU2jMffSM8bHSuBs=",
+        "lastModified": 1709546977,
+        "narHash": "sha256-R0bi8zAWt1s1q7lSvwiFI8+kEL29rm4WtYTqPgjlEBs=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "093f82e5707bb6f14ee38a742748f9fb4ab1488e",
+        "rev": "e7a277c5d12bf570efa2427d9cfdb760b9a0512f",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/modules/tippy/ssh.nix b/home-manager/modules/tippy/ssh.nix
index 2a719547..b03f2084 100644
--- a/home-manager/modules/tippy/ssh.nix
+++ b/home-manager/modules/tippy/ssh.nix
@@ -39,7 +39,7 @@ with lib.strings; {
           user = "tippy";
           checkHostIP = false;
           forwardAgent = true;
-          forwardX11 = true;
+          # forwardX11 = true;
         };
         "canonical" = {
           match = concatStrings ["canonical final Host " (concatMapStringsSep "," (x: concatStrings ["*." x]) ([osConfig.networking.domain] ++ osConfig.environment.domains))];
diff --git a/nixos/hosts/arx8/default.nix b/nixos/hosts/arx8/default.nix
index 1e9c1707..be119d76 100644
--- a/nixos/hosts/arx8/default.nix
+++ b/nixos/hosts/arx8/default.nix
@@ -9,11 +9,11 @@
     ++ nixosModules.desktop.all
     ++ [
       ./hardware-configuration.nix
+      nixosModules.services.fw-proxy
     ];
-  # environment.isCN = true;
+  environment.isCN = true;
   environment.systemPackages = with pkgs; [
     lenovo-legion
-    refind
     efibootmgr
   ];
   services.create_ap = {
diff --git a/nixos/hosts/surface/default.nix b/nixos/hosts/surface/default.nix
index 85d438cb..a7e91781 100644
--- a/nixos/hosts/surface/default.nix
+++ b/nixos/hosts/surface/default.nix
@@ -31,8 +31,9 @@
     };
   };
 
+  environment.isCN = true;
+
   environment.systemPackages = with pkgs; [
-    refind
     efibootmgr
   ];
 }
diff --git a/nixos/modules/base/nixpkgs.nix b/nixos/modules/base/nixpkgs.nix
index 86f229fb..cc65c658 100644
--- a/nixos/modules/base/nixpkgs.nix
+++ b/nixos/modules/base/nixpkgs.nix
@@ -21,8 +21,8 @@
         comma = prev.comma.override {
           nix-index-unwrapped = final.nix-index-with-db;
         };
-        # tailscale = prev.tailscale.overrideAttrs (old: {
-        tailscale = inputs'.tailscale.packages.tailscale.overrideAttrs (old: {
+        tailscale = prev.tailscale.overrideAttrs (old: {
+          # tailscale = inputs'.tailscale.packages.tailscale.overrideAttrs (old: {
           subPackages = old.subPackages ++ ["cmd/derper"] ++ ["cmd/derpprobe"];
         });
       }
diff --git a/nixos/modules/desktop/game/nintendo.nix b/nixos/modules/desktop/game/nintendo.nix
deleted file mode 100644
index b93ff6b6..00000000
--- a/nixos/modules/desktop/game/nintendo.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    yuzu-mainline
-  ];
-  environment.global-persistence.user = {
-    directories = [
-    ];
-  };
-}