diff --git a/flake.nix b/flake.nix
index 23ace7d..7adef43 100644
--- a/flake.nix
+++ b/flake.nix
@@ -161,6 +161,7 @@
             extraSpecialArgs = {
                 inputs = inputs // {
                     nathan = import ./home-manager/nathan;
+                    home-manager-config = import ./home-manager;
                 };
             };
 
diff --git a/system-config/configuration/android/default.nix b/system-config/configuration/android/default.nix
index 4757614..4ee1803 100644
--- a/system-config/configuration/android/default.nix
+++ b/system-config/configuration/android/default.nix
@@ -1,6 +1,13 @@
 { config, lib, pkgs, inputs, ... }: {
 
+    options.sysconfig.remoteBuildClient = with lib; mkOption {
+        type = with types; bool;
+        default = false;
+    };
+
     config = {
+        sysconfig.remoteBuildClient = true;
+
         home-manager = {
             backupFileExtension = ".backup";
             useUserPackages = true;