diff --git a/modules/home/default.nix b/modules/home/default.nix
index 2fb39a6..33eae30 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -23,6 +23,7 @@ in
     ./xdg.nix
   ];
 
+  programs.home-manager.enable = true;
   programs.fish.enable = true;
   programs.nix-index.enable = true;
   programs.ssh = {
diff --git a/modules/system/sane-defaults.nix b/modules/system/sane-defaults.nix
index 502eab5..fcd1cde 100644
--- a/modules/system/sane-defaults.nix
+++ b/modules/system/sane-defaults.nix
@@ -108,6 +108,8 @@ let
 
     i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
     boot.kernel.sysctl."kernel.yama.ptrace_scope" = 0;
+
+    settei.user.config.services.ssh-agent.enable = true;
   };
 
   darwinConfig = lib.optionalAttrs (!isLinux) {
diff --git a/modules/system/user.nix b/modules/system/user.nix
index 7d0637a..da80a4e 100644
--- a/modules/system/user.nix
+++ b/modules/system/user.nix
@@ -51,9 +51,6 @@ in
             homeDirectory = config.users.users.${username}.home;
             stateVersion = "22.05";
           };
-
-          programs.home-manager.enable = true;
-          services.ssh-agent.enable = true;
         };
       };
     in