From 6d744eb2ed36517cb15c220a9871608a33332f20 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 5 Apr 2025 09:00:00 +0100
Subject: [PATCH] Extract a thunar mixin

---
 hosts/t480/configuration.nix      |  2 +-
 modules/mixins/thunar.nix         | 13 +++++++++++++
 modules/nixos/desktop/default.nix |  1 -
 modules/nixos/desktop/thunar.nix  | 24 ------------------------
 4 files changed, 14 insertions(+), 26 deletions(-)
 create mode 100644 modules/mixins/thunar.nix
 delete mode 100644 modules/nixos/desktop/thunar.nix

diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index d61b3781..92046f5f 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -10,6 +10,7 @@
     ../../modules/mixins/bluetooth.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/phpactor
+    ../../modules/mixins/thunar.nix
 
     ../common
     ../../users/opdavies
@@ -19,7 +20,6 @@
     dwm.enable = true;
     redshift.enable = true;
     st.enable = true;
-    thunar.enable = true;
     peek.enable = true;
   };
 
diff --git a/modules/mixins/thunar.nix b/modules/mixins/thunar.nix
new file mode 100644
index 00000000..b44265d4
--- /dev/null
+++ b/modules/mixins/thunar.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  programs.thunar = {
+    enable = true;
+
+    plugins = with pkgs.xfce; [
+      thunar-archive-plugin
+    ];
+  };
+
+  environment.systemPackages = with pkgs; [ xfce.tumbler ];
+}
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 154389c4..b9036c4b 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -4,6 +4,5 @@
     ./peek.nix
     ./screenkey.nix
     ./st.nix
-    ./thunar.nix
   ];
 }
diff --git a/modules/nixos/desktop/thunar.nix b/modules/nixos/desktop/thunar.nix
deleted file mode 100644
index 755e6204..00000000
--- a/modules/nixos/desktop/thunar.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-{
-  options.nixosModules.thunar.enable = mkEnableOption "Enable thunar";
-
-  config = mkIf config.nixosModules.thunar.enable {
-    programs.thunar = {
-      enable = true;
-
-      plugins = with pkgs.xfce; [
-        thunar-archive-plugin
-      ];
-    };
-
-    environment.systemPackages = with pkgs; [ xfce.tumbler ];
-  };
-}