From 9ec72adb2735adce51275c166c3e00f430b10376 Mon Sep 17 00:00:00 2001 From: winston Date: Sun, 11 Jun 2023 05:17:07 +0200 Subject: [PATCH] feat(linux): use pcmanfm as file browser --- home/apps/i3.nix | 4 ++-- home/default.nix | 8 ++++---- home/xdg.nix | 2 +- machines/common/linux/xsession.nix | 8 +------- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/home/apps/i3.nix b/home/apps/i3.nix index 98a6c53..b92922e 100644 --- a/home/apps/i3.nix +++ b/home/apps/i3.nix @@ -53,7 +53,7 @@ modFocus = "${mod}+Ctrl"; hyper = "Mod4+Mod1+Shift+Ctrl"; - thunar = lib.getExe pkgs.xfce.thunar; + pcmanfm = lib.getExe pkgs.pcmanfm; screenshot = if wayland then "${lib.getExe pkgs.sway-contrib.grimshot} copy area" @@ -70,7 +70,7 @@ "${mod}+Shift+q" = "kill"; # Start Applications "${mod}+Shift+Return" = "exec ${terminal}"; - "${mod}+e" = "exec --no-startup-id ${thunar}"; + "${mod}+e" = "exec --no-startup-id ${pcmanfm}"; "${hyper}+p" = "exec --no-startup-id ${screenshot}"; # change focus diff --git a/home/default.nix b/home/default.nix index 4f48f41..4df7f8d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -34,15 +34,15 @@ in { fd ffmpeg file + gh + gocryptfs imagemagick just mdcat + mosh ranger ripgrep - git-secret - gh - gocryptfs - mosh + sops ] ++ lib.optionals isLinux [ _1password-gui diff --git a/home/xdg.nix b/home/xdg.nix index 8078e48..c322de9 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -46,7 +46,7 @@ in { dataHome = "${homeDirectory}/.local/share"; mimeApps = { enable = isLinux; - defaultApplications."inode/directory" = "thunar.desktop"; + defaultApplications."inode/directory" = "pcmanfm.desktop"; }; }; } diff --git a/machines/common/linux/xsession.nix b/machines/common/linux/xsession.nix index 7b59fee..4b1ba94 100644 --- a/machines/common/linux/xsession.nix +++ b/machines/common/linux/xsession.nix @@ -5,6 +5,7 @@ unzip zip gnome.file-roller + pcmanfm # thumbnails webp-pixbuf-loader @@ -13,13 +14,6 @@ programs = { dconf.enable = true; noisetorch.enable = true; - thunar = { - enable = true; - plugins = with pkgs.xfce; [ - thunar-archive-plugin - thunar-volman - ]; - }; }; programs.sway = {