diff --git a/flake.nix b/flake.nix
index 4c7a28f..b949257 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,7 @@
 
         NicksNixLaptop = lib.nixosSystem {
           inherit system;
-          specialArgs = inputs;
+          specialArgs = { inherit user; };
 
           modules = [
             {
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
deleted file mode 100644
index ee213a2..0000000
--- a/hosts/laptop/home.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, inputs, nixpkgs, home-manager, user, kmonad, ... }:
-
-{
-    home-manager.nixosModules.home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            extraSpecialArgs = { inherit user; };
-            users.${user} = { 
-                imports = [
-                    ../../users/${user}.nix
-                    ../../modules/emacs.nix
-                    ../../../modules/git.nix
-                    ../../modules/fusuma.nix
-                    ../../modules/vim.nix
-                    ../../modules/wezterm.nix
-                    ../../modules/xdg.nix
-                    ../../modules/zsh.nix
-                ];
-            };
-            users.nicholix = {
-                imports = [
-                    ../../users/nicholix.nix
-                    ../../modules/emacs.nix
-                    ../../modules/git.nix
-                    ../../modules/fusuma.nix
-                    ../../modules/vim.nix
-                    ../../modules/wezterm.nix
-                    ../../modules/xdg.nix
-                    ../../modules/zsh.nix
-                ];
-            };
-    };
-}
\ No newline at end of file
diff --git a/users/nicholix.nix b/users/nicholix.nix
index b08385f..e45dd4c 100644
--- a/users/nicholix.nix
+++ b/users/nicholix.nix
@@ -9,7 +9,7 @@ let
       extensions = [ "rust-src" "rust-analysis" ];}
     );
 
-    user = "nicholix";
+    local_user = "nicholix";
 in
 {
   imports = [
@@ -31,8 +31,8 @@ in
   home = {
     # Home Manager needs a bit of information about you and the
     # paths it should manage.
-    username = user;
-    homeDirectory = "/home/${user}";
+    username = local_user;
+    homeDirectory = "/home/${local_user}";
 
     # This value determines the Home Manager release that your
     # configuration is compatible with. This helps avoid breakage