diff --git a/flake.nix b/flake.nix
index 4509032..102cee9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,25 @@
         #nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
         nixpkgs-us.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-unstable";
 
+        home-manager = {
+            #url = "github:nix-community/home-manager/release-24.11";
+            url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
+
+        nixpkgs-droid.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.05";
+        
+        home-manager-droid = {
+            #url = "github:nix-community/home-manager/release-24.11";
+            url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.05";
+            inputs.nixpkgs.follows = "nixpkgs-droid";
+        };
+
+        nix-on-droid = {
+            url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nix-on-droid?ref=release-24.05";
+            inputs.nixpkgs.follows = "nixpkgs-droid";
+        };
+
         disko = {
             url = "github:nix-community/disko";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -20,11 +39,6 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        home-manager = {
-            #url = "github:nix-community/home-manager/release-24.11";
-            url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
 
         firefox-addons = {
             url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
@@ -59,7 +73,7 @@
 
     };
 
-    outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
+    outputs = { self, nixpkgs, home-manager, nix-on-droid, ... } @ inputs: {
 
         tokyo-night-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation {
 
@@ -130,26 +144,20 @@
             };
         };
 
+        nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
+            pkgs = import nixpkgs { system = "aarch64-linux"; };
 
-        homeConfigurations = {
-
-            "nix-on-droid" = home-manager.lib.homeManagerConfiguration {
-                
-                pkgs = import nixpkgs { system = "aarch64-linux"; };
-
-                extraSpecialArgs = { inherit inputs; };
-
-                modules = [ 
-                    ./home-manager/nix-on-droid
-                    {
-                        config.homeconfig = {
-                           wal.enable = true;
-                           calcurse.enable = true;
-                           home-manager.enable = true;
+            modules = [
+                {
+                    home-manager.extraSpecialArgs = {
+                        inputs = inputs // {
+                            nix-on-droid-home-manager = import ./home-manager/nix-on-droid;
                         };
-                    }
-                ];
-            };
+                    };
+                }
+                ./system-config/configuration/android 
+                ./system-config
+            ];
         };
     };
 }