diff --git a/flake.nix b/flake.nix
index 2675f15..3f514c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,7 +48,7 @@
     } @ inputs: {
         nixosConfigurations = {
             NOcomputer = nixpkgs.lib.nixosSystem {
-                system = "x86_64-linux";
+                # system = "x86_64-linux";
                 specialArgs = {inherit inputs;};
                 modules = [
                     disko.nixosModules.disko
@@ -69,7 +69,7 @@
                 ];
             };
             NOlaptop = nixpkgs.lib.nixosSystem {
-                system = "x86_64-linux";
+                # system = "x86_64-linux";
                 specialArgs = {inherit inputs;};
                 modules = [
                     disko.nixosModules.disko
@@ -95,7 +95,7 @@
                 ];
             };
             NOmom = nixpkgs.lib.nixosSystem {
-                system = "x86_64-linux";
+                # system = "x86_64-linux";
                 specialArgs = {inherit inputs;};
                 modules = [
                     nixos-hardware.nixosModules.common-cpu-intel
diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix
index 025fdd0..7feab0f 100644
--- a/users/tao/HOME.nix
+++ b/users/tao/HOME.nix
@@ -122,8 +122,10 @@ in {
 
         git = {
             enable = true;
-            userName = "Tao Tien";
-            userEmail = "29749622+taotien@users.noreply.github.com";
+            settings.user = {
+                name = "Tao Tien";
+                email = "29749622+taotien@users.noreply.github.com";
+            };
             # extraConfig = {
             # };
             ignores = [
@@ -144,9 +146,11 @@ in {
 
         ssh = {
             enable = true;
-            addKeysToAgent = "yes";
-            compression = true;
             matchBlocks = {
+                "*" = {
+                    addKeysToAgent = "yes";
+                    compression = true;
+                };
                 "stargate" = {
                     hostname = "stargate.cs.usfca.edu";
                     user = "tltien";