diff --git a/home-manager/users/nathan/default.nix b/home-manager/users/nathan/default.nix
index ff47a4c..6c634cf 100644
--- a/home-manager/users/nathan/default.nix
+++ b/home-manager/users/nathan/default.nix
@@ -38,7 +38,7 @@
             defaultSopsFile = ./secrets.yaml;
             defaultSopsFormat = "yaml";
         };
-
+/*
         nix = {
             nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
             settings = {
@@ -58,7 +58,7 @@
                 port = 2222;
             };
         };
-
+*/
         services.mpris-proxy.enable = true;
 
         programs.ssh.enable = true;
diff --git a/system-config/users/default.nix b/system-config/users/default.nix
index 699dfe0..7e84bb8 100644
--- a/system-config/users/default.nix
+++ b/system-config/users/default.nix
@@ -84,7 +84,7 @@
                 inputs.home-manager-config
             ];
             users = (builtins.mapAttrs 
-                (name: user: (lib.mkMerge [
+                (name: user: (lib.mkMerge ([
                     {
                         homeconfig = {
                             host = config.sysconfig.host;
@@ -92,12 +92,12 @@
                             graphical = config.sysconfig.graphical;
                         };
                     }
-                ] ++ (if inputs ? ${user.username} then [ (inputs.${user.username} { config = config.home-manager.users.${user.username}; }) ] else []) 
-                  ++ user.home-manager.extraModules))
+                ] ++ (if inputs ? ${user.username} then [ (inputs.${user.username} { config = config.home-manager.users.${user.username}; inherit inputs; }) ] else []) 
+                  ++ user.home-manager.extraModules)))
                 (builtins.removeAttrs 
                     config.sysconfig.users 
                     (builtins.partition 
-                        (name: (config.sysconfig.users.${name}.home-manager.enable && !config.sysconfig.users.${name}.home-manager.standalone))
+                        (x: (config.sysconfig.users.${x}.home-manager.enable && !config.sysconfig.users.${x}.home-manager.standalone))
                         (builtins.attrNames config.sysconfig.users)
                     ).wrong
                 )