diff --git a/nate/dotfiles/sway/config.d/application_defaults b/nate/dotfiles/sway/config.d/application_defaults
index 3bff6ba..195caf1 100644
--- a/nate/dotfiles/sway/config.d/application_defaults
+++ b/nate/dotfiles/sway/config.d/application_defaults
@@ -5,8 +5,8 @@ for_window [app_id="firefox"] focus
 assign [class="firefox"] 2
 for_window [class="firefox"] focus
 
-assign [app_id=thunar] 3
-for_window [app_id=thunar] focus
+assign [app_id=nautilus] 3
+for_window [app_id=nautilus] focus
 
 assign [class="Telegram"] 4
 for_window [class="Telegram"] focus
diff --git a/nate/dotfiles/sway/config.d/default b/nate/dotfiles/sway/config.d/default
index 2d73c74..91fca34 100644
--- a/nate/dotfiles/sway/config.d/default
+++ b/nate/dotfiles/sway/config.d/default
@@ -219,7 +219,7 @@ bindsym $mod+r mode "resize"
 #
 # App shortcuts
 #
-    bindsym $mod+t exec thunar
+    bindsym $mod+t exec nautilus
     bindsym $mod+w exec firefox
     bindsym $mod+j exec obsidian & ~/Documents/Obsidian Vault/auto-add.sh
 #
diff --git a/nate/dotfiles/waybar/config b/nate/dotfiles/waybar/config
index 55c702d..ccfab2a 100644
--- a/nate/dotfiles/waybar/config
+++ b/nate/dotfiles/waybar/config
@@ -238,7 +238,7 @@
 
    "custom/files": {
         "format": " 󰉋 ",
-        "on-click": "exec thunar",
+        "on-click": "exec nautilus",
         "tooltip": false,
     },
 
diff --git a/nate/modules/sway/sway_conf.nix b/nate/modules/sway/sway_conf.nix
index a880af3..dfc8b04 100644
--- a/nate/modules/sway/sway_conf.nix
+++ b/nate/modules/sway/sway_conf.nix
@@ -69,6 +69,7 @@
                 mako
                 man-pages
                 man-pages-posix
+                nautilus
                 ncspot
                 networkmanagerapplet
                 pavucontrol
@@ -95,13 +96,11 @@
         # adds additional man pages
         documentation.dev.enable = true;
 
-        # Thunar config
-        programs.thunar = {
-            enable = true;
-            plugins = with pkgs.xfce; [
-                thunar-archive-plugin
-                thunar-volman
-            ];
+        # For nautilus
+        services.gnome.sushi.enable = true;
+        programs.nautilus-open-any-terminal = {
+          enable = true;
+          terminal = "foot";
         };
         programs.file-roller.enable = true;
         programs.xfconf.enable = true;