diff --git a/hosts/Dimaga/hardware-configuration.nix b/hosts/Dimaga/hardware-configuration.nix
index 7621995..6525c25 100644
--- a/hosts/Dimaga/hardware-configuration.nix
+++ b/hosts/Dimaga/hardware-configuration.nix
@@ -30,7 +30,7 @@
     "/" = {
       device = "/dev/disk/by-uuid/76d67291-5aed-4f2a-b71f-1c2871cefe24";
       fsType = "btrfs";
-      options = [ "subvol=@,compress=zstd" ];
+      options = [ "subvol=@,compress=zstd,discard" ];
     };
     "/boot" = {
       device = "/dev/disk/by-uuid/0C53-A645";
diff --git a/hosts/Haven/hardware-configuration.nix b/hosts/Haven/hardware-configuration.nix
index 57a62b7..f086177 100644
--- a/hosts/Haven/hardware-configuration.nix
+++ b/hosts/Haven/hardware-configuration.nix
@@ -42,12 +42,12 @@
     "/" = {
       device = "/dev/disk/by-uuid/2c76c660-3573-4622-8771-f23fa7ee302a";
       fsType = "btrfs";
-      options = [ "subvol=@,compress=zstd" ];
+      options = [ "subvol=@,compress=zstd,discard" ];
     };
     "/home" = {
       device = "/dev/disk/by-uuid/2c76c660-3573-4622-8771-f23fa7ee302a";
       fsType = "btrfs";
-      options = [ "subvol=@home,compress=zstd" ];
+      options = [ "subvol=@home,compress=zstd,discard" ];
     };
     "/swap" = {
       device = "/dev/disk/by-uuid/2c76c660-3573-4622-8771-f23fa7ee302a";
diff --git a/hosts/Khanda/hardware-configuration.nix b/hosts/Khanda/hardware-configuration.nix
index 89587fb..d21cb13 100644
--- a/hosts/Khanda/hardware-configuration.nix
+++ b/hosts/Khanda/hardware-configuration.nix
@@ -75,7 +75,7 @@
     "/" = {
       device = "/dev/disk/by-uuid/b34afd29-94ff-421b-bb96-8497951abf58";
       fsType = "btrfs";
-      options = [ "subvol=@,compress=zstd" ];
+      options = [ "subvol=@,compress=zstd,discard" ];
     };
 
     "/boot" = {
diff --git a/hosts/Shura/hardware-configuration.nix b/hosts/Shura/hardware-configuration.nix
index 9bdfddd..f66f624 100644
--- a/hosts/Shura/hardware-configuration.nix
+++ b/hosts/Shura/hardware-configuration.nix
@@ -48,12 +48,12 @@
     "/" = {
       device = "/dev/disk/by-uuid/b801fbea-4cb5-4255-bea9-a2ce77d1a1b7";
       fsType = "btrfs";
-      options = [ "subvol=@,compress=zstd" ];
+      options = [ "subvol=@,compress=zstd,discard" ];
     };
     "/home" = {
       device = "/dev/disk/by-uuid/b801fbea-4cb5-4255-bea9-a2ce77d1a1b7";
       fsType = "btrfs";
-      options = [ "subvol=@home,compress=zstd" ];
+      options = [ "subvol=@home,compress=zstd,discard" ];
     };
     "/swap" = {
       device = "/dev/disk/by-uuid/b801fbea-4cb5-4255-bea9-a2ce77d1a1b7";
diff --git a/modules/base/programs.nix b/modules/base/programs.nix
index 17e17fc..e812fb7 100644
--- a/modules/base/programs.nix
+++ b/modules/base/programs.nix
@@ -9,11 +9,11 @@
       enable = true;
       syntaxHighlight = true;
       nanorc = ''
-                set linenumbers
-                set tabsize 4
-                set softwrap
-        		set autoindent
-        		set indicator
+        set linenumbers
+        set tabsize 4
+        set softwrap
+        set autoindent
+        set indicator
       '';
     };
 
diff --git a/modules/base/system.nix b/modules/base/system.nix
index 50afc76..01ecb86 100644
--- a/modules/base/system.nix
+++ b/modules/base/system.nix
@@ -38,6 +38,9 @@
     # Enable fwupd (firmware updater)
     fwupd.enable = true;
 
+    # Enable trim on supported drives
+    fstrim.enable = true;
+
     # Autoscrub BTRFS partitions
     btrfs.autoScrub = lib.mkIf (config.fileSystems."/".fsType == "btrfs") {
       enable = true;