fix: surface

jz8132543 · Mar 8, 2024 · 644798f · 644798f
1 parent 8c39f54
commit 644798f
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 54 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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
@@ -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
@@ -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