diff --git a/modules/gnome/home.nix b/modules/gnome/home.nix
index c3bf833..677dd92 100644
--- a/modules/gnome/home.nix
+++ b/modules/gnome/home.nix
@@ -52,9 +52,10 @@ in
           "rounded-window-corners@fxgn"
         ];
       favorite-apps = [
-        "org.gnome.Nautilus.desktop"
+        "Thunar.desktop"
         "com.mitchellh.ghostty.desktop"
         "firefox.desktop"
+        "obsidian.desktop"
         "org.keepassxc.KeePassXC.desktop"
       ];
     };
@@ -76,12 +77,6 @@ in
       history-length = mkUint32 100;
     };
 
-    # Nautilus (GNOME Files) configuration
-    "org/gnome/nautilus/preferences" = {
-      show-hidden-files = true;
-      default-folder-viewer = "list-view";
-    };
-
     # Disable GNOME Software auto-updates
     "org/gnome/software" = {
       download-updates = false;
@@ -174,6 +169,7 @@ in
     ++ [
       gnomeExtensions.pano
       gnomeExtensions.rounded-window-corners
+      xfce.thunar
     ];
 
   # Custom desktop file for opening text files with Neovim in Ghostty
@@ -193,6 +189,9 @@ in
   xdg.mimeApps = {
     enable = true;
     defaultApplications = {
+      # Directories
+      "inode/directory" = "Thunar.desktop";
+
       # PDF documents
       "application/pdf" = "org.gnome.Evince.desktop";
 
diff --git a/modules/gnome/system.nix b/modules/gnome/system.nix
index 416d61d..a2f07b5 100644
--- a/modules/gnome/system.nix
+++ b/modules/gnome/system.nix
@@ -60,6 +60,7 @@ in
       snapshot  # camera
       totem     # video player
       yelp      # help viewer
+      nautilus  # file manager (using Thunar instead)
     ];
 
     # XDG portal for proper desktop integration
diff --git a/modules/hyprland/home.nix b/modules/hyprland/home.nix
index 66cf965..6a38778 100644
--- a/modules/hyprland/home.nix
+++ b/modules/hyprland/home.nix
@@ -425,12 +425,6 @@
 
   # Hyprland-specific shell configuration
   programs.zsh.initContent = ''
-    # Open current directory in Thunar file manager (background)
-    open() {
-      thunar "''${1:-.}" &>/dev/null &
-      disown
-    }
-
     # Quickly restart Hyprland session (graceful logout)
     alias hypr-restart='loginctl terminate-session'