diff --git a/modules/nixos/base/admin.nix b/modules/nixos/base/admin.nix
index 1cced70..530d81b 100644
--- a/modules/nixos/base/admin.nix
+++ b/modules/nixos/base/admin.nix
@@ -20,6 +20,8 @@ in {
       shell = pkgs.${admin.shell};
       initialPassword = "password";
       openssh.authorizedKeys.keys = [keys.users."${admin.name}"];
+      createHome = true;
+      home = "/home/${admin.name}";
       extraGroups =
         [
           "wheel"
@@ -35,15 +37,5 @@ in {
           "torrenter"
         ];
     };
-    home-manager = mkIf (role == "workstation" || admin.homeManager) {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-      backupFileExtension = "hm.old";
-      verbose = true;
-      extraSpecialArgs = {inherit inputs inputs' self self';};
-      users.${admin.name} = {
-        imports = ["${self}/modules/home/base"];
-      };
-    };
   };
 }
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
index 9bcd8bd..b039af3 100644
--- a/modules/nixos/base/default.nix
+++ b/modules/nixos/base/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ./nix.nix
+    ./home-manager.nix
     ./boot.nix
     ./admin.nix
     ./locale.nix
diff --git a/modules/nixos/base/home-manager.nix b/modules/nixos/base/home-manager.nix
new file mode 100644
index 0000000..ceed372
--- /dev/null
+++ b/modules/nixos/base/home-manager.nix
@@ -0,0 +1,25 @@
+{
+  inputs,
+  inputs',
+  self,
+  self',
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf;
+  inherit (config.ooknet.host) admin;
+in {
+  config = mkIf admin.homeManager {
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+      backupFileExtension = "hm.old";
+      verbose = true;
+      extraSpecialArgs = {inherit inputs inputs' self self';};
+      users.${admin.name} = {
+        imports = ["${self}/modules/home/base"];
+      };
+    };
+  };
+}