diff --git a/modules/features/host-base.nix b/modules/features/host-base.nix
index 9c85a9e..6cc804c 100644
--- a/modules/features/host-base.nix
+++ b/modules/features/host-base.nix
@@ -5,6 +5,7 @@
 }:
 let
   nixosModules = config.flake.modules.nixos;
+  hmModules = config.flake.modules.homeManager;
 in
 {
   flake.modules.nixos.host-base = {
@@ -20,6 +21,11 @@ in
       useGlobalPkgs = true;
       backupFileExtension = "bak";
       extraSpecialArgs = { inherit inputs; };
+      sharedModules = [
+        hmModules.syncthing
+        hmModules.shell
+        hmModules.neovim
+      ];
     };
 
     users.mutableUsers = false;
diff --git a/modules/features/workstation-base.nix b/modules/features/workstation-base.nix
index 389fe18..58789e4 100644
--- a/modules/features/workstation-base.nix
+++ b/modules/features/workstation-base.nix
@@ -43,18 +43,15 @@ in
       homeModules.email
       homeModules.local-apps
       homeModules.mpv
-      homeModules.neovim
       homeModules.nh
       homeModules.niri
       homeModules.nix
       homeModules.pim
       homeModules.podman
       homeModules.qbittorrent-client
-      homeModules.shell
       homeModules.sops
       homeModules.git
       homeModules.ssh-client
-      homeModules.syncthing
       homeModules.terminal
       homeModules.theme
       homeModules.vicinae