diff --git a/.gitignore b/.gitignore
index 06b6a15..0c92e47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,7 @@
 !hosts/
 !overlays/
 !profiles/
+!modules/
+!applications/
 
 !/flake/
diff --git a/hosts/default.nix b/hosts/default.nix
index 83fe160..d705b23 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -7,6 +7,8 @@
 let
   inherit (inputs.nixpkgs.lib) nixosSystem;
 
+  userName = "moons";
+
   mkSystem =
     {
       host,
@@ -19,11 +21,12 @@ let
     nixosSystem {
       inherit system;
       modules = [
+        ./${host}/hardware-configuration.nix
         ../profiles/${profile}.nix
-        ../hosts/${host}/default.nix
+        ./${host}/default.nix
       ]
       ++ extraModules;
-      specialArgs = { inherit inputs; };
+      specialArgs = { inherit inputs userName; };
     };
 in
 {
diff --git a/profiles/base.nix b/profiles/base.nix
index 958608a..9ef46a6 100644
--- a/profiles/base.nix
+++ b/profiles/base.nix
@@ -1 +1,8 @@
-_: { }
+{
+  userName,
+  ...
+}:
+{
+  imports = [ ];
+  home-manager.users.${userName}.imports = [ ];
+}