diff --git a/home/apps/sway.nix b/home/apps/sway.nix
index 575fbdb..b3437aa 100644
--- a/home/apps/sway.nix
+++ b/home/apps/sway.nix
@@ -96,7 +96,7 @@ in {
           modFocus = "${mod}+Ctrl";
           hyper = "Mod4+Mod1+Shift+Ctrl";
 
-          pcmanfm = "${pkgs.pcmanfm}/bin/pcmanfm";
+          filebrowser = "${pkgs.gnome.nautilus}/bin/nautilus";
           screenshot = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
           playerctl = "${pkgs.playerctl}/bin/playerctl";
           wpctl = pkgs.wireplumber + "/bin/wpctl";
@@ -110,7 +110,7 @@ in {
           "${mod}+Shift+q" = "kill";
           # Start Applications
           "${mod}+Shift+Return" = "exec ${terminal}";
-          "${mod}+e" = "exec --no-startup-id ${pcmanfm}";
+          "${mod}+e" = "exec --no-startup-id ${filebrowser}";
           "${hyper}+p" = "exec --no-startup-id ${screenshot}";
 
           # change focus
diff --git a/home/xdg.nix b/home/xdg.nix
index 03f3062..933ec88 100644
--- a/home/xdg.nix
+++ b/home/xdg.nix
@@ -50,7 +50,7 @@ in {
     dataHome = "${homeDirectory}/.local/share";
     mimeApps = {
       enable = isLinux;
-      defaultApplications."inode/directory" = "pcmanfm.desktop";
+      defaultApplications."inode/directory" = "nautilus.desktop";
     };
   };
 }
diff --git a/machines/common/linux/default.nix b/machines/common/linux/default.nix
index 74a29e6..6e7f60f 100644
--- a/machines/common/linux/default.nix
+++ b/machines/common/linux/default.nix
@@ -4,8 +4,8 @@
     ./greeter.nix
     ./input.nix
     ./network.nix
+    ./session.nix
     ./sound.nix
-    ./xsession.nix
   ];
 
   console.colors = [
diff --git a/machines/common/linux/xsession.nix b/machines/common/linux/session.nix
similarity index 80%
rename from machines/common/linux/xsession.nix
rename to machines/common/linux/session.nix
index 48b5185..64aed99 100644
--- a/machines/common/linux/xsession.nix
+++ b/machines/common/linux/session.nix
@@ -5,7 +5,8 @@
     unzip
     zip
     gnome.file-roller
-    pcmanfm
+    gnome.nautilus
+    gnome.sushi
 
     # thumbnails
     webp-pixbuf-loader
@@ -41,11 +42,18 @@
     };
   };
 
-  # gcr needed for gnome3 pinentry
-  services.dbus.packages = with pkgs; [darkman gcr];
+  services.dbus.packages = with pkgs; [
+    darkman
+    # gcr needed for gnome3 pinentry, managed in Home-Manager
+    gcr
+    gnome.sushi
+  ];
   xdg.portal.enable = true;
   xdg.portal.wlr.enable = true;
-  xdg.portal.extraPortals = with pkgs; [darkman xdg-desktop-portal-gtk];
+  xdg.portal.extraPortals = with pkgs; [
+    darkman
+    xdg-desktop-portal-gtk
+  ];
 
   services = {
     # mounting