From 9065b4a9e09c7eb42da7b655c09fc3be28076aa9 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Fri, 28 Feb 2025 05:23:25 +0000 Subject: [PATCH] Revert "Swap nautilus for thunar" This reverts commit 05ee091ca04332f7be68258e091a08ed7d6b4f61. --- system/desktop.nix | 10 ++-------- system/home/hyprland.nix | 6 +++++- system/mimeapps.nix | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/system/desktop.nix b/system/desktop.nix index f6a871e1..c30a055f 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -35,6 +35,7 @@ grim slurp swappy + nautilus xfce.ristretto g4music picard @@ -62,17 +63,9 @@ programs = { ssh.enableAskPassword = true; dconf.enable = true; - xfconf.enable = true; noisetorch.enable = true; seahorse.enable = true; file-roller.enable = true; - thunar = { - enable = true; - plugins = with pkgs.xfce; [ - thunar-archive-plugin - thunar-volman - ]; - }; hyprland = { enable = true; xwayland.enable = true; @@ -92,6 +85,7 @@ 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 ca8967e8..0b26b9ee 100644 --- a/system/home/hyprland.nix +++ b/system/home/hyprland.nix @@ -280,6 +280,10 @@ "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" @@ -346,7 +350,7 @@ "SUPER, C, exec, ${config.programs.alacritty.package}/bin/alacritty" "SUPER, E, exec, ${config.programs.emacs.finalPackage}/bin/emacs" "SUPER, W, exec, ${config.programs.firefox.finalPackage}/bin/firefox" - "SUPER, F, exec, thunar" + "SUPER, F, exec, ${pkgs.nautilus}/bin/nautilus" # 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 39d23f75..c20f4e4c 100644 --- a/system/mimeapps.nix +++ b/system/mimeapps.nix @@ -3,8 +3,8 @@ let browser = [ "firefox.desktop" ]; in { - "inode/directory" = [ "org.xfce.thunar.desktop" ]; - "inode/symlink" = [ "org.xfce.thunar.desktop" ]; + "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; + "inode/symlink" = [ "org.gnome.Nautilus.desktop" ]; "image/jpeg" = [ "com.xfce.ristretto.desktop" ]; "image/png" = [ "com.xfce.ristretto.desktop" ];