diff --git a/flake.nix b/flake.nix
index eb74659..d702e52 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,6 +44,7 @@
       }
       // info;
   in {
+    # linux only
     nixosConfigurations = {
       desktop = lib.nixosSystem {
         inherit system;
@@ -53,15 +54,6 @@
         ];
       };
     };
-    darwinConfigurations = {
-      macos = darwin.lib.darwinSystem {
-        system = "aarch64-darwin";
-        modules = [
-          ./nixos/macos/darwin.nix
-          # home-manager.darwinModules.home-manager
-        ];
-      };
-    };
     homeConfigurations = {
       desktop = home-manager.lib.homeManagerConfiguration {
         pkgs = import nixpkgs {
@@ -78,5 +70,19 @@
         modules = [./home/desktop/home.nix];
       };
     };
+    # exclusive to macos M series
+    darwinConfigurations = {
+      macos = darwin.lib.darwinSystem {
+        system = "aarch64-darwin";
+        modules = [
+          ./nixos/macos/darwin.nix
+          home-manager.darwinModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+          }
+        ];
+      };
+    };
   };
 }
diff --git a/info.nix b/info.nix
index 7f96300..41a07d5 100644
--- a/info.nix
+++ b/info.nix
@@ -7,6 +7,7 @@
   vpnSecretFile = "/home/biscuit/Wireguard/secret";
 
   allowUnfree = true;
+  touchpadSupport = false;
 
   termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
 
@@ -24,12 +25,18 @@
       delfin
     ];
 
+  sshExtraConfig = ''
+    Host macair
+      User lsoriano
+      HostName 192.168.68.81
+  '';
+
+  # BUILD (optional), you can remove these blocks.
   trustedUsers = [
     "lsoriano"
     "@groups"
     "biscuit"
   ];
-
   buildMachines = [
     {
       hostName = "192.168.68.81";
@@ -39,6 +46,4 @@
       supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
     }
   ];
-
-  touchpadSupport = false;
 }
diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix
index 194886e..a4f5025 100644
--- a/nixos/desktop/configuration.nix
+++ b/nixos/desktop/configuration.nix
@@ -3,6 +3,7 @@
   allowUnfree,
   buildMachines,
   trustedUsers,
+  sshExtraConfig,
   ...
 }: {
   imports = [
@@ -25,11 +26,7 @@
     experimental-features = ["nix-command" "flakes"];
   };
 
-  programs.ssh.extraConfig = ''
-    Host macair
-      User lsoriano
-      HostName 192.168.68.81
-  '';
+  programs.ssh.extraConfig = sshExtraConfig;
 
   nix.distributedBuilds = true;
   nix.settings.builders-use-substitutes = true;
diff --git a/system/vpn.nix b/system/vpn.nix
index b7de2f0..7957085 100644
--- a/system/vpn.nix
+++ b/system/vpn.nix
@@ -1,4 +1,8 @@
-{vpnSecretFile, ...}: {
+{
+  vpnSecretFile,
+  username,
+  ...
+}: {
   networking.wg-quick.interfaces = {
     biscuit-default = {
       address = ["10.2.0.2/32"];