diff --git a/home/programs.nix b/home/programs.nix
index 1a27d5f..395f2fb 100644
--- a/home/programs.nix
+++ b/home/programs.nix
@@ -7,11 +7,6 @@
 
     i3lock-fancy
 
-    xfce.thunar
-    xfce.thunar-volman
-    # mounting external devices in thunar
-    gvfs
-
     antigen
     nodejs
     fortune
diff --git a/machines/common.nix b/machines/common.nix
index a3139e2..fcebe6f 100644
--- a/machines/common.nix
+++ b/machines/common.nix
@@ -56,7 +56,13 @@ inputs:
     /* unbound.enable = true; */
     resolved.enable = true;
 
+    /* mount as user */
     udisks2.enable = true;
+    gvfs = {
+      enable = true;
+      package = pkgs.gvfs;
+    };
+
     # Enable CUPS to print documents.
     printing.enable = true;
     pipewire = {
@@ -114,8 +120,6 @@ inputs:
     wget
     which
 
-    xfce.thunar
-    xfce.thunar-volman
     gvfs
 
     # yubikey packages
@@ -151,6 +155,10 @@ inputs:
       enableSSHSupport = true;
       pinentryFlavor = "curses";
     };
+    thunar = {
+      enable = true;
+      plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
+    };
   };
 
   environment.sessionVariables = {