From 18176bf959ee23fadd97abe36e3088fd99a8e458 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Wed, 3 Jul 2024 13:10:26 +0200 Subject: [PATCH] Change from thunar to pcmanfm thunar failed to find default applications and also default terminal to open was dependend on xfce settings --- modules/home/i3/i3/config | 2 +- modules/home/yazi/default.nix | 2 +- modules/nixos/pcmanfm/default.nix | 40 +++++++++++++++++++++++++++ systems/x86_64-linux/aspi/default.nix | 3 +- 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 modules/nixos/pcmanfm/default.nix diff --git a/modules/home/i3/i3/config b/modules/home/i3/i3/config index 8f06dc6..39410b7 100644 --- a/modules/home/i3/i3/config +++ b/modules/home/i3/i3/config @@ -215,7 +215,7 @@ bindsym $mod+Print exec --no-startup-id "xfce4-screenshooter" bindsym $mod+c exec qalculate-gtk bindsym $mod+Shift+p exec xwacomcalibrate -bindsym $mod+e exec thunar +bindsym $mod+e exec pcmanfm bindsym $mod+b exec firefox bindsym $mod+p exec $scripts/display-toggle-mirror diff --git a/modules/home/yazi/default.nix b/modules/home/yazi/default.nix index bc9b464..d994020 100644 --- a/modules/home/yazi/default.nix +++ b/modules/home/yazi/default.nix @@ -56,7 +56,7 @@ in # Override defaults { on = [ "e" ]; - run = ''shell --orphan --confirm "thunar &"''; + run = ''shell --orphan --confirm "pcmanfm &"''; desc = "Open gui file manager"; } { diff --git a/modules/nixos/pcmanfm/default.nix b/modules/nixos/pcmanfm/default.nix new file mode 100644 index 0000000..6b6218a --- /dev/null +++ b/modules/nixos/pcmanfm/default.nix @@ -0,0 +1,40 @@ +{ + # Snowfall Lib provides a customized `lib` instance with access to your flake's library + # as well as the libraries available from your flake's inputs. + lib, + # An instance of `pkgs` with your overlays and packages applied is also available. + pkgs, + # You also have access to your flake's inputs. + inputs, + + # Additional metadata is provided by Snowfall Lib. + namespace, # The namespace used for your flake, defaulting to "internal" if not set. + system, # The system architecture for this host (eg. `x86_64-linux`). + target, # The Snowfall Lib target for this system (eg. `x86_64-iso`). + format, # A normalized name for the system target (eg. `iso`). + virtual, # A boolean to determine whether this system is a virtual target using nixos-generators. + systems, # An attribute map of your defined hosts. + + # All other arguments come from the module system. + config, + ... +}: + +let + cfg = config.modules.pcmanfm; +in +{ + options.modules.pcmanfm = { + enable = lib.mkOption { default = false; }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + shared-mime-info # extended mimetype support + lxde.lxmenu-data # open with "Installed Applications" + pcmanfm + ]; + + services.gvfs.enable = true; # Mount, trash, and other functionalities + }; +} diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix index 146c078..b3ea6da 100644 --- a/systems/x86_64-linux/aspi/default.nix +++ b/systems/x86_64-linux/aspi/default.nix @@ -71,7 +71,8 @@ modules = { locales.enable = true; - thunar.enable = true; + # thunar.enable = true; + pcmanfm.enable = true; # wayland.enable = true; # hyprland.enable = true; };