diff --git a/user/home-manager.nix b/user/home-manager.nix
new file mode 100644
index 0000000..9c8452a
--- /dev/null
+++ b/user/home-manager.nix
@@ -0,0 +1,28 @@
+{ pkgs, lib, ... }:
+{
+  programs.home-manager.enable = true;
+
+  systemd.user.services.home-manager-expire = {
+    Unit = {
+      Description = "Remove old home-manager generations";
+    };
+    Service = {
+      Type = "oneshot";
+      ExecStart = pkgs.writeShellScript "home-manager-expire" ''
+        ${lib.getExe pkgs.home-manager} expire-generations 7d
+      '';
+    };
+  };
+  systemd.user.timers.home-manager-expire = {
+    Unit = {
+      Description = "Remove old home-manager generations";
+    };
+    Timer = {
+      OnCalendar = "daily";
+      Unit = "home-manager-expire.service";
+    };
+    Install = {
+      WantedBy = [ "timers.target" ];
+    };
+  };
+}
diff --git a/user/home.nix b/user/home.nix
index c384c60..31e3871 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -9,6 +9,7 @@
 {
   imports = [
     ./dummy.nix
+    ./home-manager.nix
     ./waybar
     ./helix.nix
     ./kakoune
@@ -44,6 +45,7 @@
     inputs.nix-index-database.hmModules.nix-index
     ../settings
     ./powerplay-led-idle.nix
+    ./rm-target.nix
   ];
 
   my = import ./variables.nix // {
@@ -57,8 +59,6 @@
   home.username = "lelgenio";
   home.homeDirectory = "/home/lelgenio";
 
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
   home.packages = with pkgs; [
     terminal
 
@@ -169,30 +169,6 @@
         exec nicotine
       '';
 
-  systemd.user.services.rm-target = {
-    Unit = {
-      Description = "Remove directories named 'target'";
-    };
-    Service = {
-      Type = "oneshot";
-      ExecStart = pkgs.writeShellScript "rm-target" ''
-        sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf --
-      '';
-    };
-  };
-  systemd.user.timers.rm-target = {
-    Unit = {
-      Description = "Remove directories named 'target'";
-    };
-    Timer = {
-      OnCalendar = "weekly";
-      Unit = "rm-target.service";
-    };
-    Install = {
-      WantedBy = [ "timers.target" ];
-    };
-  };
-
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage
   # when a new Home Manager release introduces backwards
diff --git a/user/rm-target.nix b/user/rm-target.nix
new file mode 100644
index 0000000..93c6058
--- /dev/null
+++ b/user/rm-target.nix
@@ -0,0 +1,26 @@
+{ pkgs, lib, ... }:
+{
+  systemd.user.services.rm-target = {
+    Unit = {
+      Description = "Remove directories named 'target'";
+    };
+    Service = {
+      Type = "oneshot";
+      ExecStart = pkgs.writeShellScript "rm-target" ''
+        sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf --
+      '';
+    };
+  };
+  systemd.user.timers.rm-target = {
+    Unit = {
+      Description = "Remove directories named 'target'";
+    };
+    Timer = {
+      OnCalendar = "weekly";
+      Unit = "rm-target.service";
+    };
+    Install = {
+      WantedBy = [ "timers.target" ];
+    };
+  };
+}