From 05ee091ca04332f7be68258e091a08ed7d6b4f61 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 31 Jan 2025 07:26:06 +0000
Subject: [PATCH] Swap nautilus for thunar

---
 system/desktop.nix       | 11 +++++++++--
 system/home/hyprland.nix |  6 +-----
 system/mimeapps.nix      |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/system/desktop.nix b/system/desktop.nix
index 07e02a9d..b4ac7f68 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -24,6 +24,7 @@
     systemPackages = with pkgs; [
       libsecret
       libnotify
+      libarchive
       xdg-utils
       hunspell
       hunspellDicts.en_GB-large
@@ -34,7 +35,6 @@
       swappy
       cameractrls-gtk4
       czkawka
-      nautilus
       libreoffice
       zotero
       evince
@@ -64,11 +64,19 @@
   };
   programs = {
     dconf.enable = true;
+    xfconf.enable = true;
     noisetorch.enable = true;
     seahorse.enable = true;
     file-roller.enable = true;
     hyprland.enable = true;
     xwayland.enable = true;
+    thunar = {
+      enable = true;
+      plugins = with pkgs.xfce; [
+        thunar-archive-plugin
+        thunar-volman
+      ];
+    };
   };
   gtk.iconCache.enable = true;
   qt = {
@@ -83,7 +91,6 @@
     tumbler.enable = true;
     udisks2.enable = true;
     blueman.enable = config.hardware.bluetooth.enable;
-    gnome.sushi.enable = true;
     gvfs = {
       enable = true;
       package = pkgs.gnome.gvfs;
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index 1d05a5a6..e33b8ba0 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -281,10 +281,6 @@
         "center, title:Library,class:firefox"
         "pin, title:Picture-in-Picture,class:firefox"
 
-        # NautilusPreviewer (Sushi)
-        "float, class:org.gnome.NautilusPreviewer"
-        "center, class:org.gnome.NautilusPreviewer"
-
         # Electron file picker dialog
         "float, title:Open Files,class:electron"
         "size 800 600, title:Open Files,class:electron"
@@ -353,7 +349,7 @@
           "SUPER, C, exec, ${config.programs.foot.package}/bin/foot"
           "SUPER, E, exec, ${config.programs.emacs.finalPackage}/bin/emacs"
           "SUPER, W, exec, ${pkgs.nyxt}/bin/nyxt"
-          "SUPER, F, exec, ${pkgs.nautilus}/bin/nautilus"
+          "SUPER, F, exec, thunar"
 
           # Misc useful binds
           ",Print,exec,${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.swappy}/bin/swappy -f -"
diff --git a/system/mimeapps.nix b/system/mimeapps.nix
index f75a7249..2e86a8d2 100644
--- a/system/mimeapps.nix
+++ b/system/mimeapps.nix
@@ -3,8 +3,8 @@ let
   browser = [ "nyxt.desktop" ];
 in
 {
-  "inode/directory" = [ "org.gnome.Nautilus.desktop" ];
-  "inode/symlink" = [ "org.gnome.Nautilus.desktop" ];
+  "inode/directory" = [ "org.xfce.thunar.desktop" ];
+  "inode/symlink" = [ "org.xfce.thunar.desktop" ];
 
   "image/jpeg" = [ "com.github.weclaw1.ImageRoll.desktop" ];
   "image/png" = [ "com.github.weclaw1.ImageRoll.desktop" ];