diff --git a/flake.nix b/flake.nix
index 718e185b..eb1377e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,8 +116,13 @@
               ./home/default.nix
               ./home/${hostName}.nix
             ];
-            home = {inherit username;};
+            home = {
+              inherit username;
+              homeDirectory = "/home/${username}";
+              stateVersion = "23.05";
+            };
             programs.home-manager.enable = true;
+            nixpkgs.config.allowUnfree = true;
           };
         };
       })
diff --git a/home/Legion.nix b/home/Legion.nix
index 68d2dab2..5e437cd4 100644
--- a/home/Legion.nix
+++ b/home/Legion.nix
@@ -1 +1 @@
-{...}: {imports = [./default.nix];}
+{...}: {imports = [./shell.nix ./emacs.nix];}
diff --git a/home/default.nix b/home/default.nix
index 0e7126dd..9a1527f1 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -15,11 +15,4 @@
     # Additional Scripts
     ./scripts/default.nix
   ];
-  programs.home-manager.enable = true;
-  nixpkgs.config.allowUnfree = true;
-  home = {
-    username = lib.mkDefault "pixelifytica";
-    homeDirectory = "/home/${config.home.username}";
-    stateVersion = "23.05";
-  };
 }