diff --git a/common/default.nix b/common/default.nix
index ba0a48b..11e5d0a 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -6,6 +6,7 @@
     ./boot.nix
     ./environment.nix
     ./home-manager.nix
+    ./misc.nix
     ./nginx.nix
     ./nix.nix
     ./openssh.nix
diff --git a/common/misc.nix b/common/misc.nix
new file mode 100644
index 0000000..e470d54
--- /dev/null
+++ b/common/misc.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  nix.gc.automatic = true;
+  nix.optimise.automatic = true;
+  services.fstrim.enable = true;
+}
\ No newline at end of file
diff --git a/hosts/kilgharrah/hardware.nix b/hosts/kilgharrah/hardware.nix
index 274ac27..899e591 100644
--- a/hosts/kilgharrah/hardware.nix
+++ b/hosts/kilgharrah/hardware.nix
@@ -4,7 +4,6 @@
   hardware.enableAllFirmware = true;
   hardware.cpu.intel.updateMicrocode = true;
   services.fwupd.enable = true;
-  services.fstrim.enable = true;
 
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia.modesetting.enable = true; # this defaults to true from 24.11
diff --git a/hosts/tohru/hardware.nix b/hosts/tohru/hardware.nix
index c4880a5..715ed4f 100644
--- a/hosts/tohru/hardware.nix
+++ b/hosts/tohru/hardware.nix
@@ -4,6 +4,5 @@
   hardware.enableAllFirmware = true;
   hardware.cpu.intel.updateMicrocode = true;
   services.fwupd.enable = true;
-  services.fstrim.enable = true;
 }