diff --git a/flake.in.nix b/flake.in.nix
index 460d0b3..e391098 100644
--- a/flake.in.nix
+++ b/flake.in.nix
@@ -119,12 +119,17 @@
                     inputs.arion.nixosModules.arion
                     inputs.disko.nixosModules.disko
                     inputs.fw-fanctrl.nixosModules.default
+                    inputs.jovian-nixos.nixosModules.default
                     inputs.niri-flake.nixosModules.niri
                   ];
 
                   # TODO: Use home-manager.sharedModules for all options
                   home-manager.sharedModules = [
                     inputs."nix-index-database-${branch}".hmModules.nix-index
+                    inputs.ags.homeManagerModules.default
+                    inputs.anyrun.homeManagerModules.default
+                    inputs.nix-flatpak.homeManagerModules.nix-flatpak
+                    inputs.walker.homeManagerModules.default
                   ];
                 }
               )
diff --git a/options/custom/programs/ags/default.nix b/options/custom/programs/ags/default.nix
index ab2245e..cbb9b94 100644
--- a/options/custom/programs/ags/default.nix
+++ b/options/custom/programs/ags/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  inputs,
   lib,
   ...
 }:
@@ -10,8 +9,6 @@ in {
   options.custom.programs.ags.enable = mkOption {default = false;};
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
-    imports = [inputs.ags.homeManagerModules.default];
-
     # https://aylur.github.io/ags-docs
     # https://github.com/Aylur/ags
     programs.ags = {
diff --git a/options/custom/services/flatpak.nix b/options/custom/services/flatpak.nix
index ed155b3..73ea920 100644
--- a/options/custom/services/flatpak.nix
+++ b/options/custom/services/flatpak.nix
@@ -24,8 +24,6 @@ in {
       ];
 
     home-manager.users.${config.custom.username} = {
-      imports = [inputs.nix-flatpak.homeManagerModules.nix-flatpak];
-
       # https://wiki.nixos.org/wiki/Flatpak
       # https://github.com/gmodena/nix-flatpak
       services.flatpak = {
diff --git a/profiles/console/default.nix b/profiles/console/default.nix
index 94aefce..745b30c 100644
--- a/profiles/console/default.nix
+++ b/profiles/console/default.nix
@@ -1,13 +1,10 @@
 {
   config,
-  inputs,
   lib,
   options,
   pkgs,
   ...
 }: {
-  imports = [inputs.jovian-nixos.nixosModules.default];
-
   custom = {
     minimal = true;
     profile = "console";