diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 7a4ec730..4574c319 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -36,7 +36,6 @@
       dwm.enable = true;
       media.makemkv.enable = true;
       st.enable = true;
-      thunar.enable = true;
     };
   };
 
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 4dbd9578..3b645d60 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -12,7 +12,6 @@
     ./pipewire.nix
     ./podman.nix
     ./st.nix
-    ./thunar.nix
     ./zram.nix
   ];
 }
diff --git a/modules/nixos/thunar.nix b/modules/nixos/thunar.nix
deleted file mode 100644
index 4e9676ab..00000000
--- a/modules/nixos/thunar.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.desktop.thunar;
-in
-{
-  options.features.desktop.thunar.enable = mkEnableOption "Enable thunar";
-
-  config = mkIf cfg.enable {
-    programs.thunar = {
-      enable = true;
-
-      plugins = with pkgs.xfce; [
-        thunar-archive-plugin
-      ];
-    };
-
-    environment.systemPackages = with pkgs; [ xfce.tumbler ];
-  };
-}
diff --git a/modules2/thunar/enable.nix b/modules2/thunar/enable.nix
new file mode 100644
index 00000000..5ac63555
--- /dev/null
+++ b/modules2/thunar/enable.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.pc.nixos.programs.thunar.enable = true;
+}
diff --git a/modules2/thunar/extra-packages.nix b/modules2/thunar/extra-packages.nix
new file mode 100644
index 00000000..036a7ff1
--- /dev/null
+++ b/modules2/thunar/extra-packages.nix
@@ -0,0 +1,7 @@
+{
+  flake.modules.pc.nixos =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [ xfce.tumbler ];
+    };
+}
diff --git a/modules2/thunar/plugins.nix b/modules2/thunar/plugins.nix
new file mode 100644
index 00000000..5df3e2ab
--- /dev/null
+++ b/modules2/thunar/plugins.nix
@@ -0,0 +1,9 @@
+{
+  flake.modules.pc.nixos =
+    { pkgs, ... }:
+    {
+      programs.thunar.plugins = with pkgs.xfce; [
+        thunar-archive-plugin
+      ];
+    };
+}