diff --git a/modules/common/nix.nix b/modules/common/nix.nix
index 581a1fc..0f8b35c 100644
--- a/modules/common/nix.nix
+++ b/modules/common/nix.nix
@@ -1,6 +1,10 @@
-{ pkgs, lib, inputs, config, ... }: {
-  environment.systemPackages = with pkgs; [ nix-output-monitor ];
+{ lib, inputs, config, ... }: {
   programs.git.enable = true;
+  programs.nh = {
+    enable = true;
+    clean.enable = true;
+    clean.extraArgs = "--keep-since 7d";
+  };
   nix = let flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
   in {
     settings = {
@@ -8,11 +12,6 @@
       flake-registry = "";
       nix-path = config.nix.nixPath;
     };
-    gc = {
-      automatic = true;
-      options = "--delete-older-than 7d";
-      dates = "weekly";
-    };
     optimise.automatic = true;
     registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
     nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
diff --git a/systems/smolboi/home.nix b/systems/smolboi/home.nix
index ae1a6b4..5d02f2e 100644
--- a/systems/smolboi/home.nix
+++ b/systems/smolboi/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
 {
   # Home Manager needs a bit of information about you and the paths it should
@@ -79,14 +79,10 @@
   };
 
   systemd.user = {
-    services.gc = {
-      Service = { Exec = "nix-collect-garbage --delete-older-than 30d"; };
-    };
-    timers.gc = { Timer = { OnCalendar = "weekly"; }; };
     targets.tray = {
       Unit = {
         Description = "System Tray";
-        Requires = [ "graphical-session-pre.target" ];
+        Requires = [ "graphical-session.target" ];
       };
     };
   };