diff --git a/modules/desktop/desktop-entries.nix b/modules/desktop/desktop-entries.nix
index 7da1689..04e540b 100644
--- a/modules/desktop/desktop-entries.nix
+++ b/modules/desktop/desktop-entries.nix
@@ -1,30 +1,6 @@
 { lib, pkgs, ... }:
 
 let
-  thunarDesktopOverride = pkgs.makeDesktopItem {
-    name = "thunar";
-    desktopName = "Files";
-    genericName = "File Manager";
-    tryExec = "thunar";
-    exec = "thunar %U";
-    icon = "org.xfce.thunar";
-    categories = [
-      "Utility"
-      "FileManager"
-    ];
-    mimeTypes = [ "inode/directory" ];
-    keywords = [
-      "folder"
-      "manager"
-      "explorer"
-      "files"
-    ];
-    startupNotify = true;
-    startupWMClass = "Thunar";
-    terminal = false;
-    comment = "Browse files";
-  };
-
   ptyxisDesktopOverride = pkgs.makeDesktopItem {
     name = "org.gnome.Ptyxis";
     desktopName = "Terminal";
@@ -41,7 +17,6 @@ let
 in
 {
   environment.systemPackages = lib.mkAfter [
-    (lib.hiPrio thunarDesktopOverride)
     (lib.hiPrio ptyxisDesktopOverride)
   ];
 }
diff --git a/modules/desktop/file-manager.nix b/modules/desktop/file-manager.nix
deleted file mode 100644
index 9764e7d..0000000
--- a/modules/desktop/file-manager.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.etc."xdg/xfce4/xfconf/xfce-perchannel-xml/exo.xml".text = ''
-    <?xml version="1.0" encoding="UTF-8"?>
-    <channel name="exo" version="1.0">
-      <property name="helpers" type="empty">
-        <property name="TerminalEmulator" type="string" value="${pkgs.ptyxis}/bin/ptyxis"/>
-      </property>
-    </channel>
-  '';
-
-  services.gvfs.enable = true;
-  services.tumbler.enable = true;
-
-  programs.thunar = {
-    enable = true;
-    plugins = [
-      pkgs.xfce.thunar-archive-plugin
-      pkgs.xfce.thunar-media-tags-plugin
-      pkgs.xfce.thunar-vcs-plugin
-      pkgs.xfce.thunar-volman
-    ];
-  };
-
-  programs.xfconf.enable = true;
-}
diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix
index 929d076..bd9f8ab 100644
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -30,6 +30,9 @@ in
   services.displayManager.gdm.enable = true;
   services.desktopManager.gnome.enable = true;
 
+  # Virtual filesystem backend for Nautilus: mounting, trash, network shares.
+  services.gvfs.enable = true;
+
   services.gnome.core-developer-tools.enable = false;
   services.gnome.games.enable = false;
 
@@ -41,7 +44,7 @@ in
           "org/gnome/shell" = {
             disable-user-extensions = false;
             favorite-apps = [
-              "thunar.desktop"
+              "org.gnome.Nautilus.desktop"
               "org.gnome.Ptyxis.desktop"
               "com.ranfdev.DistroShelf.desktop"
               "io.github.kolunmi.Bazaar.desktop"
@@ -94,6 +97,8 @@ in
     pkgs.gnome-extension-manager
     pkgs.mission-center
     pkgs.papirus-icon-theme
+    pkgs.file-roller
+    pkgs.unrar
     pkgs.gnomeExtensions.all-in-one-clipboard
     pkgs.gnomeExtensions.alphabetical-app-grid
     pkgs.gnomeExtensions.app-hider
@@ -129,7 +134,6 @@ in
     pkgs.gnome-system-monitor
     pkgs.gnome-weather
     pkgs.loupe
-    pkgs.nautilus
     pkgs.papers
     # gnome-connections
     pkgs.showtime
diff --git a/modules/profile/nanuqsaurus.nix b/modules/profile/nanuqsaurus.nix
index 0904657..9c50ad5 100644
--- a/modules/profile/nanuqsaurus.nix
+++ b/modules/profile/nanuqsaurus.nix
@@ -16,7 +16,6 @@
     ../system/printer.nix
     ../system/impermanence.nix
     ../desktop/desktop-entries.nix
-    ../desktop/file-manager.nix
     ../desktop/gnome.nix
     ../users/admin.nix
   ];