diff --git a/flake.nix b/flake.nix
index 5565899..44e1740 100644
--- a/flake.nix
+++ b/flake.nix
@@ -158,7 +158,6 @@
 
             modules = [
                 ./system-config/configuration/android 
-                ./system-config
             ];
 
             extraSpecialArgs = {
diff --git a/system-config/configuration/android/default.nix b/system-config/configuration/android/default.nix
index 2863a59..955a914 100644
--- a/system-config/configuration/android/default.nix
+++ b/system-config/configuration/android/default.nix
@@ -1,24 +1,32 @@
-{ config, lib, pkgs, ... }: {
+{ config, lib, pkgs, inputs, ... }: {
 
     config = {
         home-manager = {
             backupFileExtension = ".backup";
-            config = { config, lib, pkgs, inputs }: {
+            config = {
                 imports = [
                     inputs.nathan
                 ];
-                config.homeconfig = {
-                    wal.enable = true;
-                    calcurse.enable = true;
+                config = {
+                    homeconfig = {
+                        wal.enable = true;
+                        calcurse.enable = true;
+                    };
+
+                    home.homeDirectory = "/data/data/com.termux.nix/files/home";
                 };
             };
         };
 
         terminal.font = "${pkgs.fira-code}/share/fonts/truetype/FiraCode-VF.ttf";
 
-        user.shell = "${pkgs.zsh}/bin/zsh";
+        user = {
+            shell = "${pkgs.zsh}/bin/zsh";
+        };
 
-        system.stateVersion = "24.05";
+        android-integration = {};
+
+        system.stateVersion = "24.11";
 
         environment = {
             etcBackupExtension = ".backup";
diff --git a/system-config/users/default.nix b/system-config/users/default.nix
index 9cbdb36..a570661 100644
--- a/system-config/users/default.nix
+++ b/system-config/users/default.nix
@@ -62,7 +62,7 @@
     };
 
 
-    config = {
+    config = lib.mkIf (config.sysconfig.host != "android") {
         users.users = builtins.mapAttrs (x: y: let
             cfg = config.sysconfig.users.${x};
         in {