diff --git a/home/toast/programs/hyprland.nix b/home/toast/programs/hyprland.nix
index 83da3b6..c058d64 100644
--- a/home/toast/programs/hyprland.nix
+++ b/home/toast/programs/hyprland.nix
@@ -13,7 +13,7 @@
       exec-once = [ "uwsm app -- firefox" "kime" ];
 
      "$terminal" = "uwsm app -- kitty";
-     "$fileManager" = "uwsm app -- kitty yazi";
+     "$fileManager" = "uwsm app -- thunar";
      "$menu" = "uwsm app -- $(tofi-drun)";
      "$mod" = "SUPER";
 
diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix
index ee94390..27da4d1 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@@ -32,6 +32,10 @@
       type = "kime";
     };
   };
+  services.xserver = {
+    xkb.layout = "us";
+    videoDrivers = [ "nvidia" ];
+  };
 
   users.users.toast = {
     isNormalUser = true;
@@ -53,10 +57,16 @@
     withUWSM = true;
     xwayland.enable = true;
   };
-  services.xserver = {
-    xkb.layout = "us";
-    videoDrivers = [ "nvidia" ];
+  programs.thunar = {
+    enable = true;
+    plugins = with pkgs.xfce; [
+      thunar-volman
+    ];
   };
+  programs.xfconf.enable = true;
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.tumbler.enable = true; # Thumbnail support for images 
+
   environment.sessionVariables = {
     # WLR_NO_HARDWARE_CURSORS = "1";
     NIXOS_OZONE_WL = "1";