diff --git a/configuration.nix b/configuration.nix
index 3cc4281..0611299 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -51,6 +51,8 @@
     };
     # Enable CUPS to print.
     printing.enable = true;
+    # For Samba support in Nautilus.
+    gvfs.enable = true;
   };
 
   # Define a user account.
@@ -75,6 +77,12 @@
     curl
     alacritty
     dmenu
+
+    gnome.nautilus
+    lxqt.lxqt-policykit # provides a default authentication client for policykit
+
+    #libsForQt5.dolphin
+    #libsForQt5.kdegraphics
   ];
 
   # Enable zsh for setting it as shell for users.
diff --git a/flake.nix b/flake.nix
index 99614ca..123cfa0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,10 @@
               useUserPackages = true;
               users.elias = import ./home/default.nix;
             };
-            nixpkgs.overlays = [ inputs.neovim-nightly-overlay.overlay ];
+            nixpkgs.overlays = [
+              inputs.neovim-nightly-overlay.overlay
+              ./home/overlays/nautilus.nix
+            ];
           }
         ];
       };
diff --git a/home/overlays/nautilus.nix b/home/overlays/nautilus.nix
new file mode 100644
index 0000000..bebb5f0
--- /dev/null
+++ b/home/overlays/nautilus.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+final: prev: {
+  nautilus = prev.nautilus.override { rev = 3.34 0.3; };
+}
+
diff --git a/home/programs/default.nix b/home/programs/default.nix
index c6b5c7b..e190f06 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./alacritty
-    ./thunar
     ./neovim
     ./git.nix
     ./wallpaper.nix
diff --git a/home/programs/thunar/default.nix b/home/programs/thunar/default.nix
deleted file mode 100644
index 4b78ae5..0000000
--- a/home/programs/thunar/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.xfconf.enable = true;
-  programs.thunar.enable = true;
-  programs.thunar.plugins = with pkgs.xfce; [
-    thunar-archive-plugin
-    thunar-volman
-  ];
-  services = {
-    gvfs.enable = true; # Mount, trash, ...
-    tumbler.enable = true; # Thumbnail support for images.
-  };
-}