diff --git a/homes/nathan/home-manager/packages/scripts/default.nix b/homes/nathan/home-manager/packages/scripts/default.nix
index ec1ba0d..67a5d42 100644
--- a/homes/nathan/home-manager/packages/scripts/default.nix
+++ b/homes/nathan/home-manager/packages/scripts/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: let
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: let
 
         system = "x86_64-linux";
 
diff --git a/homes/nathan/home-manager/programs/default.nix b/homes/nathan/home-manager/programs/default.nix
index 1088e57..6a65120 100644
--- a/homes/nathan/home-manager/programs/default.nix
+++ b/homes/nathan/home-manager/programs/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: {
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         config = {
 
diff --git a/homes/nathan/home-manager/programs/firefox/default.nix b/homes/nathan/home-manager/programs/firefox/default.nix
index fd13565..b45fb19 100644
--- a/homes/nathan/home-manager/programs/firefox/default.nix
+++ b/homes/nathan/home-manager/programs/firefox/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: {
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         options.homeconfig.firefox.enable = lib.options.mkOption {
             type = lib.types.bool;
diff --git a/homes/nathan/home-manager/programs/nh/default.nix b/homes/nathan/home-manager/programs/nh/default.nix
index 1911c35..97a89ac 100644
--- a/homes/nathan/home-manager/programs/nh/default.nix
+++ b/homes/nathan/home-manager/programs/nh/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.homeModules.nathan = { config, lib, inputs, ... }: {
+    flake.homeModules.nathan = { config, lib, ... }: {
 
         options.homeconfig.nh.enable = lib.options.mkOption {
             type = lib.types.bool;
diff --git a/homes/nathan/home-manager/programs/pywal/default.nix b/homes/nathan/home-manager/programs/pywal/default.nix
index 9b316d6..d3f16f4 100644
--- a/homes/nathan/home-manager/programs/pywal/default.nix
+++ b/homes/nathan/home-manager/programs/pywal/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: {
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         options.homeconfig.wal.enable = lib.options.mkOption {
             type = lib.types.bool;
diff --git a/system/users/default.nix b/system/users/default.nix
index edaf8db..d1a12b5 100644
--- a/system/users/default.nix
+++ b/system/users/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ self, ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... } @ inputs: {
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig = with lib; {
 
@@ -92,7 +92,7 @@
         };
 
 
-        config = lib.mkIf (config.sysconfig.host != "android") {
+        config = {
             users.users = builtins.mapAttrs (x: y: let
                     cfg = config.sysconfig.users.${x};
                     in {
@@ -110,7 +110,6 @@
 
             home-manager = {
                 backupFileExtension = "backup";
-                extraSpecialArgs = { inherit inputs; };
                 useUserPackages = true;
                 sharedModules = [];
                 users = builtins.listToAttrs (builtins.map 
@@ -118,13 +117,7 @@
                          name = x; 
                          value = (lib.mkMerge ([
 
-                                     (if let 
-                                      dir = builtins.readDir ./.; 
-                                      in dir ? ${x} && dir.${x} == "directory" then 
-                                      import ../../homes/${x}/home-manager 
-                                      else {})
-
-                                     (if inputs ? ${x} then inputs.${x} else {})
+                            (if self.homeModules ? ${x} then self.homeModules.${x} else {})
 
                          ] ++ config.sysconfig.users.${x}.home-manager.extraModules));
                          })
diff --git a/system/users/nathan/default.nix b/system/users/nathan/default.nix
index 5dfab8e..d8e28bc 100644
--- a/system/users/nathan/default.nix
+++ b/system/users/nathan/default.nix
@@ -3,8 +3,8 @@
     flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         config = lib.mkIf (
-                config.sysconfig.users ? nathan && config.sysconfig.users.nathan.usePresets
-                ) {
+            config.sysconfig.users ? nathan && config.sysconfig.users.nathan.usePresets
+        ) {
 
             sops.secrets."nathan/pass".neededForUsers = true;