diff --git a/nixos/base.nix b/nixos/base.nix
index ac92278c..982eb93a 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -93,6 +93,5 @@ makeEnable config "myModules.base" true {
 
   programs.dconf.enable = true;
 
-  home-manager.users = forEachUser (import ./home-manager.nix);
   nix.settings.trusted-users = realUsers ++ ["gitea-runner"];
 }
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 66fa87ab..bd46bd4a 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -155,7 +155,7 @@
       }
       {
         pr = 483705; # codex: 0.89.0 -> 0.92.0
-        hash = "sha256-tkZP0ATAAuBNnJGo+xjXJD0byXAgeKoB+U3ZUaoCTHM=";
+        hash = "sha256-ZaiuRfl7gei0AyjPvLJidP3qfIaNbrvKROhKwmoiE5o=";
       }
       # claude-code
       # {
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index 487b6696..b8393356 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -1,5 +1,12 @@
 { pkgs, ... }:
 {
+  # Automatic garbage collection of old home-manager generations
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
+  };
+
   xdg.configFile."greenclip.toml".text = ''
     [greenclip]
       history_file = "~/.cache/greenclip.history"
diff --git a/nixos/justfile b/nixos/justfile
index 80763127..9304f4e2 100644
--- a/nixos/justfile
+++ b/nixos/justfile
@@ -3,12 +3,3 @@ switch *args:
 
 fix-local-path-issue:
 	nix flake update imalison-taffybar
-
-
-expire-home-manager-generations:
-	#!/usr/bin/env bash
-	set -euxo pipefail
-	for user in $(awk -F':' '{ if ($3 >= 1000 && $7 !~ /nologin|false|sync|shutdown|halt/) print $1 }' /etc/passwd); do
-	    echo $user
-	    sudo su - $user -c 'home-manager expire-generations -1days'
-	done
diff --git a/nixos/nix.nix b/nixos/nix.nix
index ff0df455..152fcb9d 100644
--- a/nixos/nix.nix
+++ b/nixos/nix.nix
@@ -19,6 +19,7 @@
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
     home-manager.backupFileExtension = "backup";
+    home-manager.sharedModules = [ ./home-manager.nix ];
 
     nix = rec {
       extraOptions = ''