diff --git a/flake.nix b/flake.nix
index d79d325..08f13c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,6 +64,7 @@
         development = import ./modules/home-manager/development;
         games = import ./modules/home-manager/games;
         mediacenter = import ./modules/home-manager/mediacenter;
+        user = import ./modules/home-manager/user;
       };
       homeConfigurations =
         flakeLib.mkHomeConfiguration {
diff --git a/modules/home-manager/base/default.nix b/modules/home-manager/base/default.nix
index 51ea1b6..d680108 100644
--- a/modules/home-manager/base/default.nix
+++ b/modules/home-manager/base/default.nix
@@ -1,14 +1,6 @@
-{vars, ...}: {
-  home = {
-    inherit (vars) username homeDirectory;
-    language.base = vars.locale;
-    stateVersion = "23.05";
-  };
-
+_: {
   imports = [
     ./news.nix
     ./nixpkgs.nix
   ];
-
-  programs.home-manager.enable = true;
 }
diff --git a/modules/home-manager/user/default.nix b/modules/home-manager/user/default.nix
new file mode 100644
index 0000000..6288a5a
--- /dev/null
+++ b/modules/home-manager/user/default.nix
@@ -0,0 +1,7 @@
+{vars, ...}: {
+  home = {
+    inherit (vars) username homeDirectory;
+    language.base = vars.locale;
+    stateVersion = "23.05";
+  };
+}
diff --git a/profiles/home-manager/odie@asgard/home.nix b/profiles/home-manager/odie@asgard/home.nix
index 452b9b4..6ac00f2 100644
--- a/profiles/home-manager/odie@asgard/home.nix
+++ b/profiles/home-manager/odie@asgard/home.nix
@@ -10,6 +10,7 @@
     outputs.homeManagerModules.desktop
     outputs.homeManagerModules.development
     outputs.homeManagerModules.games
+    outputs.homeManagerModules.user
     {
       desktop = {
         enable = true;
diff --git a/profiles/home-manager/odie@pi0/home.nix b/profiles/home-manager/odie@pi0/home.nix
index 211ae2b..e05e232 100644
--- a/profiles/home-manager/odie@pi0/home.nix
+++ b/profiles/home-manager/odie@pi0/home.nix
@@ -2,5 +2,6 @@
   imports = [
     outputs.homeManagerModules.base
     outputs.homeManagerModules.shell
+    outputs.homeManagerModules.user
   ];
 }
diff --git a/profiles/home-manager/odie@vm/home.nix b/profiles/home-manager/odie@vm/home.nix
index 211ae2b..e05e232 100644
--- a/profiles/home-manager/odie@vm/home.nix
+++ b/profiles/home-manager/odie@vm/home.nix
@@ -2,5 +2,6 @@
   imports = [
     outputs.homeManagerModules.base
     outputs.homeManagerModules.shell
+    outputs.homeManagerModules.user
   ];
 }
diff --git a/profiles/home-manager/odie@wanaheim/home.nix b/profiles/home-manager/odie@wanaheim/home.nix
index e6c5738..eb09101 100644
--- a/profiles/home-manager/odie@wanaheim/home.nix
+++ b/profiles/home-manager/odie@wanaheim/home.nix
@@ -10,6 +10,7 @@
     outputs.homeManagerModules.desktop
     outputs.homeManagerModules.development
     outputs.homeManagerModules.games
+    outputs.homeManagerModules.user
     {
       desktop = {
         enable = true;