diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix
index d748287..eedb853 100644
--- a/nixos/modules/gui/niri.nix
+++ b/nixos/modules/gui/niri.nix
@@ -17,14 +17,23 @@ in
       enable = true;
       platformTheme = "qt5ct";
     };
-    environment.systemPackages = with pkgs; [
-      bluez
-      cosmic-files
-      kdePackages.qt6ct
-      libsForQt5.qt5ct
-      xwayland-satellite-unstable
-      evince
-    ];
+    # Enabled to support trash of nautilus
+    services.gvfs.enable = true;
+    environment = {
+      pathsToLink = [ "share/thumbnailers" ];
+      systemPackages = with pkgs; [
+        nautilus
+        nautilus-open-any-terminal
+        libheif
+        libheif.out
+
+        bluez
+        kdePackages.qt6ct
+        libsForQt5.qt5ct
+        xwayland-satellite-unstable
+        evince
+      ];
+    };
     xdg = {
       terminal-exec = {
         enable = true;
@@ -39,7 +48,7 @@ in
             "org.gnome.Evince.desktop"
           ];
           "inode/directory" = [
-            "com.system76.CosmicFiles.desktop"
+            "org.gnome.Nautilus.desktop"
           ];
           "x-scheme-handler/about" = [
             "firefox-beta.desktop"
diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix
index 3e81846..4e5b46e 100644
--- a/overlays/modifications/default.nix
+++ b/overlays/modifications/default.nix
@@ -15,6 +15,7 @@ in
   ./cliphist.nix
   ./zulip.nix
   ./spotifyd.nix
+  ./nautilus.nix
 
   # Nur
   ./nur.nix
diff --git a/overlays/modifications/nautilus.nix b/overlays/modifications/nautilus.nix
new file mode 100644
index 0000000..0e9da2c
--- /dev/null
+++ b/overlays/modifications/nautilus.nix
@@ -0,0 +1,11 @@
+{ ... }:
+_final: prev: {
+  nautilus = prev.nautilus.overrideAttrs (nprev: {
+    buildInputs =
+      (nprev.buildInputs or [ ])
+      ++ (with prev.gst_all_1; [
+        gst-plugins-good
+        gst-plugins-bad
+      ]);
+  });
+}