diff --git a/modules/capabilities/ai.nix b/modules/capabilities/ai.nix
index c562b94..765d6a7 100644
--- a/modules/capabilities/ai.nix
+++ b/modules/capabilities/ai.nix
@@ -1,6 +1,7 @@
 { inputs, config, ... }:
 let
   account = config.repo.account;
+  hmModules = config.flake.modules.homeManager;
 
   sharedContext = ''
     # Global Agent Context
@@ -21,6 +22,8 @@ let
 in
 {
   flake.modules.nixos.ai = {
+    home-manager.sharedModules = [ hmModules.ai ];
+
     nixpkgs.overlays = [ inputs.llm-agents.overlays.default ];
 
     nix.settings = {
diff --git a/modules/capabilities/niri/default.nix b/modules/capabilities/niri/default.nix
index 528c05a..03c6e27 100644
--- a/modules/capabilities/niri/default.nix
+++ b/modules/capabilities/niri/default.nix
@@ -5,6 +5,7 @@
 }:
 let
   repo = config.repo;
+  hmModules = config.flake.modules.homeManager;
 in
 {
   flake.modules.nixos.niri =
@@ -12,6 +13,8 @@ in
     {
       imports = [ inputs.niri.nixosModules.niri ];
 
+      home-manager.sharedModules = [ hmModules.niri ];
+
       nixpkgs.overlays = [ inputs.niri.overlays.niri ];
 
       programs = {
diff --git a/modules/capabilities/qbittorrent-client.nix b/modules/capabilities/qbittorrent-client.nix
index 219096b..4bef764 100644
--- a/modules/capabilities/qbittorrent-client.nix
+++ b/modules/capabilities/qbittorrent-client.nix
@@ -1,5 +1,11 @@
+{ config, ... }:
+let
+  hmModules = config.flake.modules.homeManager;
+in
 {
   flake.modules.nixos.qbittorrent-client = {
+    home-manager.sharedModules = [ hmModules.qbittorrent-client ];
+
     networking.firewall = {
       allowedTCPPorts = [ 43864 ];
       allowedUDPPorts = [ 43864 ];
diff --git a/modules/capabilities/theme.nix b/modules/capabilities/theme.nix
index cbf67d3..213790f 100644
--- a/modules/capabilities/theme.nix
+++ b/modules/capabilities/theme.nix
@@ -5,6 +5,7 @@
 let
   repo = config.repo;
   repoHelpers = repo.helpers;
+  hmModules = config.flake.modules.homeManager;
 in
 {
   flake.modules.nixos.theme =
@@ -22,6 +23,8 @@ in
       };
     in
     {
+      home-manager.sharedModules = [ hmModules.theme ];
+
       environment.systemPackages = [ cursorTheme.package ];
 
       services.displayManager.sddm.settings = {
diff --git a/modules/capabilities/walker.nix b/modules/capabilities/walker.nix
index 2505168..b8904fd 100644
--- a/modules/capabilities/walker.nix
+++ b/modules/capabilities/walker.nix
@@ -16,7 +16,7 @@ in
     };
   };
 
-  flake.modules.homeManager.walker =
+  flake.modules.homeManager.walker-base =
     {
       config,
       ...
@@ -33,7 +33,7 @@ in
   flake.modules.homeManager.primary-launcher-walker =
     { config, lib, ... }:
     {
-      imports = [ homeModules.walker ];
+      imports = [ homeModules.walker-base ];
 
       meta.desktop.launcherCommand = lib.getExe config.programs.walker.package;
     };
diff --git a/modules/profiles/workstation-base.nix b/modules/profiles/workstation-base.nix
index 5e7b0fd..18b4599 100644
--- a/modules/profiles/workstation-base.nix
+++ b/modules/profiles/workstation-base.nix
@@ -39,7 +39,6 @@ in
 
   flake.modules.homeManager.workstation-base = {
     imports = [
-      homeModules.ai
       homeModules.passwords
       homeModules.clipboard
       homeModules.dev-tools
@@ -53,17 +52,13 @@ in
       homeModules.default-editor-neovim
       homeModules.email
       homeModules.mpv
-      homeModules.niri
       homeModules.nix
       homeModules.calendar-tasks
       homeModules.podman
-      homeModules.qbittorrent-client
-      homeModules.sops
       homeModules.git
       homeModules.ssh-client
       homeModules.primary-terminal-kitty
       homeModules.terminal-foot
-      homeModules.theme
       homeModules.noctalia
       {
         programs.discord = {
diff --git a/modules/secrets/sops-password.nix b/modules/secrets/sops-password.nix
index 4dc546d..a31c99b 100644
--- a/modules/secrets/sops-password.nix
+++ b/modules/secrets/sops-password.nix
@@ -1,11 +1,14 @@
 { config, ... }:
 let
   account = config.repo.account;
+  nixosModules = config.flake.modules.nixos;
 in
 {
   flake.modules.nixos.sops-password =
     { config, ... }:
     {
+      imports = [ nixosModules.sops ];
+
       sops.secrets.hashed-password.neededForUsers = true;
 
       users.users.${account.name}.hashedPasswordFile = config.sops.secrets.hashed-password.path;
diff --git a/modules/secrets/sops.nix b/modules/secrets/sops.nix
index 61fa3cd..da6982c 100644
--- a/modules/secrets/sops.nix
+++ b/modules/secrets/sops.nix
@@ -5,6 +5,7 @@
 }:
 let
   nixosModules = config.flake.modules.nixos;
+  hmModules = config.flake.modules.homeManager;
   sopsAdminKeyPath = "/var/lib/sops/keys.txt";
 in
 {
@@ -22,6 +23,8 @@ in
     {
       imports = [ nixosModules.sops ];
 
+      home-manager.sharedModules = [ hmModules.sops ];
+
       sops.age.keyFile = sopsAdminKeyPath;
 
       systemd.tmpfiles.rules = [